@dxos/plugin-thread 0.8.2-main.f081794 → 0.8.2-main.fbd8ed0

package/src/capabilities/intent-resolver.ts

@@ -2,23 +2,22 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes, createIntent, createResolver, type PluginsContext } from '@dxos/app-framework';
-import { ObjectId, Ref } from '@dxos/echo-schema';
+import { Capabilities, contributes, createIntent, createResolver, type PluginContext } from '@dxos/app-framework';
+import { createQueueDxn, Ref } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
-import { DXN, QueueSubspaceTags } from '@dxos/keys';
 import { refFromDXN } from '@dxos/live-object';
 import { log } from '@dxos/log';
 import { ATTENDABLE_PATH_SEPARATOR, DeckAction } from '@dxos/plugin-deck/types';
 import { ObservabilityAction } from '@dxos/plugin-observability/types';
 import { ChannelType, ThreadType } from '@dxos/plugin-space/types';
 import { live, fullyQualifiedId, getSpace, makeRef } from '@dxos/react-client/echo';
-import { MessageType } from '@dxos/schema';
+import { DataType } from '@dxos/schema';
 
 import { ThreadCapabilities } from './capabilities';
 import { THREAD_PLUGIN } from '../meta';
 import { ThreadAction } from '../types';
 
-export default (context: PluginsContext) =>
+export default (context: PluginContext) =>
   contributes(Capabilities.IntentResolver, [
     createResolver({
       intent: ThreadAction.CreateChannel,
@@ -26,7 +25,7 @@ export default (context: PluginsContext) =>
         data: {
           object: live(ChannelType, {
             name,
-            queue: refFromDXN(new DXN(DXN.kind.QUEUE, [QueueSubspaceTags.DATA, spaceId, ObjectId.random()])),
+            queue: refFromDXN(createQueueDxn(spaceId)),
           }),
         },
       }),
@@ -45,7 +44,7 @@ export default (context: PluginsContext) =>
           }
         }
 
-        const { state } = context.requestCapability(ThreadCapabilities.MutableState);
+        const { state } = context.getCapability(ThreadCapabilities.MutableState);
         const subjectId = fullyQualifiedId(subject);
         const thread = live(ThreadType, { name, anchor: cursor, messages: [], status: 'staged' });
         const draft = state.drafts[subjectId];
@@ -70,7 +69,7 @@ export default (context: PluginsContext) =>
     createResolver({
       intent: ThreadAction.Select,
       resolve: ({ current }) => {
-        const { state } = context.requestCapability(ThreadCapabilities.MutableState);
+        const { state } = context.getCapability(ThreadCapabilities.MutableState);
         state.current = current;
       },
     }),
@@ -103,7 +102,7 @@ export default (context: PluginsContext) =>
     createResolver({
       intent: ThreadAction.Delete,
       resolve: ({ subject, thread }, undo) => {
-        const { state } = context.requestCapability(ThreadCapabilities.MutableState);
+        const { state } = context.getCapability(ThreadCapabilities.MutableState);
         const subjectId = fullyQualifiedId(subject);
         const draft = state.drafts[subjectId];
         if (draft) {
@@ -166,13 +165,13 @@ export default (context: PluginsContext) =>
     createResolver({
       intent: ThreadAction.AddMessage,
       resolve: ({ thread, subject, sender, text }) => {
-        const { state } = context.requestCapability(ThreadCapabilities.MutableState);
+        const { state } = context.getCapability(ThreadCapabilities.MutableState);
         const subjectId = fullyQualifiedId(subject);
         const space = getSpace(subject);
         invariant(space, 'Space not found');
         const intents = [];
 
-        const message = live(MessageType, {
+        const message = live(DataType.Message, {
           sender,
           created: new Date().toISOString(),
           blocks: [{ type: 'text', text }],

package/src/capabilities/markdown.ts

@@ -2,17 +2,17 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes, type PluginsContext } from '@dxos/app-framework';
+import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
 import { MarkdownCapabilities } from '@dxos/plugin-markdown';
 
 import { ThreadCapabilities } from './capabilities';
 import { threads } from '../extensions';
 
-export default (context: PluginsContext) =>
+export default (context: PluginContext) =>
   contributes(MarkdownCapabilities.Extensions, [
     ({ document: doc }) => {
-      const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
-      const { state } = context.requestCapability(ThreadCapabilities.MutableState);
+      const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
+      const { state } = context.getCapability(ThreadCapabilities.MutableState);
       return threads(state, doc, dispatch);
     },
   ]);

package/src/components/Chat.stories.tsx

@@ -9,8 +9,7 @@ import React, { useEffect, useState } from 'react';
 
 import { Capabilities, contributes, createSurface, IntentPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { ObjectId } from '@dxos/echo-schema';
-import { DXN, QueueSubspaceTags } from '@dxos/keys';
+import { createQueueDxn } from '@dxos/echo-schema';
 import { refFromDXN } from '@dxos/live-object';
 import { ChannelType, ThreadType } from '@dxos/plugin-space/types';
 import { faker } from '@dxos/random';
@@ -19,7 +18,7 @@ import { live, type Space } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Thread } from '@dxos/react-ui-thread';
-import { MessageType } from '@dxos/schema';
+import { DataType } from '@dxos/schema';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { ChatContainer } from './ChatContainer';
@@ -39,7 +38,7 @@ const Story = () => {
         const space = await client.spaces.create();
         const channel = space.db.add(
           live(ChannelType, {
-            queue: refFromDXN(new DXN(DXN.kind.QUEUE, [QueueSubspaceTags.DATA, space.id, ObjectId.random()])),
+            queue: refFromDXN(createQueueDxn(space.id)),
           }),
         );
         setSpace(space);
@@ -80,8 +79,8 @@ const meta: Meta = {
       ],
     }),
     withTheme,
-    withLayout({ fullscreen: true, tooltips: true }),
-    withClientProvider({ createSpace: true, types: [ThreadType, MessageType] }),
+    withLayout({ fullscreen: true }),
+    withClientProvider({ createSpace: true, types: [ThreadType, DataType.Message] }),
   ],
   parameters: { translations },
 };

package/src/components/ChatContainer.tsx

@@ -14,7 +14,7 @@ import { createBasicExtensions, createThemeExtensions, listener } from '@dxos/re
 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 { MessageType } from '@dxos/schema';
+import { DataType } from '@dxos/schema';
 
 import { MessageContainer } from './MessageContainer';
 import { command } from './command-extension';
@@ -44,7 +44,7 @@ export const ChatContainer = ({ space, dxn, context, current, autoFocusTextbox }
   const id = dxn.toString();
   const identity = useIdentity()!;
   const members = useMembers(space?.key);
-  const queue = useQueue<MessageType>(dxn, { pollInterval: 1_000 });
+  const queue = useQueue<DataType.Message>(dxn, { pollInterval: 1_000 });
   const activity = useStatus(space, id);
   const { t } = useTranslation(THREAD_PLUGIN);
   // TODO(wittjosiah): This is a hack to reset the editor after a message is sent.
@@ -84,7 +84,7 @@ export const ChatContainer = ({ space, dxn, context, current, autoFocusTextbox }
     }
 
     queue.append([
-      create(MessageType, {
+      create(DataType.Message, {
         sender: { identityDid: identity.did },
         created: new Date().toISOString(),
         blocks: [{ type: 'text', text: messageRef.current }],

package/src/components/CommentContainer.tsx

@@ -42,25 +42,17 @@ const ToggleResolvedButton = ({
   const { t } = useTranslation(THREAD_PLUGIN);
   const label = t(isResolved ? 'mark as unresolved label' : 'mark as resolved label');
   return (
-    <Tooltip.Root>
-      <Tooltip.Trigger asChild>
-        <Button
-          variant='ghost'
-          data-testid='thread.toggle-resolved'
-          onClick={onResolve}
-          classNames={[commentControlClassNames, !isResolved && hoverableControlItem]}
-        >
-          <span className='sr-only'>{label}</span>
-          {isResolved ? <CheckCircle className={sizeClass} weight='fill' /> : <CheckCircle className={sizeClass} />}
-        </Button>
-      </Tooltip.Trigger>
-      <Tooltip.Portal>
-        <Tooltip.Content>
-          {label}
-          <Tooltip.Arrow />
-        </Tooltip.Content>
-      </Tooltip.Portal>
-    </Tooltip.Root>
+    <Tooltip.Trigger asChild content={label}>
+      <Button
+        variant='ghost'
+        data-testid='thread.toggle-resolved'
+        onClick={onResolve}
+        classNames={[commentControlClassNames, !isResolved && hoverableControlItem]}
+      >
+        <span className='sr-only'>{label}</span>
+        {isResolved ? <CheckCircle className={sizeClass} weight='fill' /> : <CheckCircle className={sizeClass} />}
+      </Button>
+    </Tooltip.Trigger>
   );
 };
 
@@ -68,25 +60,17 @@ const DeleteThreadButton = ({ onDelete }: { onDelete: () => void }) => {
   const { t } = useTranslation(THREAD_PLUGIN);
   const label = t('delete thread label');
   return (
-    <Tooltip.Root>
-      <Tooltip.Trigger asChild>
-        <Button
-          variant='ghost'
-          data-testid='thread.delete'
-          onClick={onDelete}
-          classNames={[commentControlClassNames, hoverableControlItem]}
-        >
-          <span className='sr-only'>{label}</span>
-          <X className={sizeClass} />
-        </Button>
-      </Tooltip.Trigger>
-      <Tooltip.Portal>
-        <Tooltip.Content classNames='z-30'>
-          {label}
-          <Tooltip.Arrow />
-        </Tooltip.Content>
-      </Tooltip.Portal>
-    </Tooltip.Root>
+    <Tooltip.Trigger asChild content={label}>
+      <Button
+        variant='ghost'
+        data-testid='thread.delete'
+        onClick={onDelete}
+        classNames={[commentControlClassNames, hoverableControlItem]}
+      >
+        <span className='sr-only'>{label}</span>
+        <X className={sizeClass} />
+      </Button>
+    </Tooltip.Trigger>
   );
 };
 
@@ -156,17 +140,9 @@ export const CommentContainer = ({
         )}
       >
         {detached ? (
-          <Tooltip.Root>
-            <Tooltip.Trigger asChild>
-              <ThreadHeading detached>{thread.name}</ThreadHeading>
-            </Tooltip.Trigger>
-            <Tooltip.Portal>
-              <Tooltip.Content classNames='z-30' side='top'>
-                {t('detached thread label')}
-                <Tooltip.Arrow />
-              </Tooltip.Content>
-            </Tooltip.Portal>
-          </Tooltip.Root>
+          <Tooltip.Trigger asChild content={t('detached thread label')} side='top'>
+            <ThreadHeading detached>{thread.name}</ThreadHeading>
+          </Tooltip.Trigger>
         ) : (
           <ThreadHeading>{thread.name}</ThreadHeading>
         )}

package/src/components/Comments.stories.tsx

@@ -14,7 +14,7 @@ import { faker } from '@dxos/random';
 import { Filter, fullyQualifiedId, useQuery, useSpace } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { type ClientRepeatedComponentProps, ClientRepeater } from '@dxos/react-client/testing';
-import { MessageType } from '@dxos/schema';
+import { DataType } from '@dxos/schema';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { CommentsContainer } from './CommentsContainer';
@@ -26,7 +26,7 @@ faker.seed(1);
 const Story = ({ spaceKey }: ClientRepeatedComponentProps) => {
   const identity = useIdentity();
   const space = useSpace(spaceKey);
-  const threads = useQuery(space, Filter.schema(ThreadType));
+  const threads = useQuery(space, Filter.type(ThreadType));
   const [detached, setDetached] = useState<string[]>([]);
 
   useEffect(() => {
@@ -54,18 +54,20 @@ const Story = ({ spaceKey }: ClientRepeatedComponentProps) => {
   );
 };
 
-export const Default = {};
-
 const meta: Meta = {
   title: 'plugins/plugin-thread/Comments',
   // TODO(wittjosiah): Use decorator.
-  render: () => <ClientRepeater component={Story} createIdentity createSpace types={[ThreadType, MessageType]} />,
+  render: () => <ClientRepeater component={Story} createIdentity createSpace types={[ThreadType, DataType.Message]} />,
   decorators: [
     withTheme,
-    withLayout({ fullscreen: true, tooltips: true }),
-    withPluginManager({ plugins: [IntentPlugin()] }),
+    withLayout({ fullscreen: true }),
+    withPluginManager({
+      plugins: [IntentPlugin()],
+    }),
   ],
   parameters: { translations },
 };
 
 export default meta;
+
+export const Default = {};

package/src/components/CommentsContainer.tsx

@@ -8,7 +8,7 @@ import React, { useEffect } from 'react';
 import { type ThreadType } from '@dxos/plugin-space/types';
 import { fullyQualifiedId } from '@dxos/react-client/echo';
 import { useTranslation, Trans } from '@dxos/react-ui';
-import { descriptionText, mx } from '@dxos/react-ui-theme';
+import { descriptionMessage, mx } from '@dxos/react-ui-theme';
 
 import { CommentContainer } from './CommentContainer';
 import { type ThreadContainerProps } from './types';
@@ -59,13 +59,7 @@ export const CommentsContainer = ({
           );
         })
       ) : (
-        <div
-          role='alert'
-          className={mx(
-            descriptionText,
-            'place-self-center border border-dashed border-unAccent rounded-lg text-center p-4 m-4',
-          )}
-        >
+        <div role='alert' className={mx(descriptionMessage, 'place-self-center rounded-lg text-center m-4')}>
           <h2 className='mbe-2 font-medium text-baseText'>{t('no comments title')}</h2>
           <p>
             <Trans

package/src/components/MessageContainer.tsx

@@ -9,7 +9,7 @@ import React, { forwardRef, useCallback, useEffect, useRef, useState } from 'rea
 import { Surface } from '@dxos/app-framework';
 import { RefArray } from '@dxos/live-object';
 import { PublicKey } from '@dxos/react-client';
-import { type ReactiveEchoObject, type Expando, type SpaceMember } from '@dxos/react-client/echo';
+import { type AnyLiveObject, type Expando, type SpaceMember } from '@dxos/react-client/echo';
 import { useIdentity, type Identity } from '@dxos/react-client/halo';
 import { Button, ButtonGroup, Tooltip, useOnTransition, useThemeContext, useTranslation } from '@dxos/react-ui';
 import { createBasicExtensions, createThemeExtensions, useTextEditor } from '@dxos/react-ui-editor';
@@ -21,7 +21,7 @@ import {
   mx,
 } from '@dxos/react-ui-theme';
 import { MessageHeading, MessageRoot } from '@dxos/react-ui-thread';
-import { type TextContentBlock, type MessageType } from '@dxos/schema';
+import { type DataType } from '@dxos/schema';
 
 import { command } from './command-extension';
 import { useOnEditAnalytics } from '../hooks';
@@ -31,17 +31,14 @@ import { getMessageMetadata } from '../util';
 // TODO(thure): #8149
 const messageControlClassNames = ['!p-1 !min-bs-0 transition-opacity', hoverableControlItem];
 
-export const MessageContainer = ({
-  message,
-  members,
-  editable = false,
-  onDelete,
-}: {
-  message: MessageType;
+export type MessageContainerProps = {
+  message: DataType.Message;
   members: SpaceMember[];
   editable?: boolean;
   onDelete?: (id: string) => void;
-}) => {
+};
+
+export const MessageContainer = ({ message, members, editable = false, onDelete }: MessageContainerProps) => {
   const senderIdentity = members.find(
     (member) =>
       (message.sender.identityDid && member.identity.did === message.sender.identityDid) ||
@@ -64,46 +61,30 @@ export const MessageContainer = ({
       <MessageHeading authorName={messageMetadata.authorName} timestamp={messageMetadata.timestamp}>
         <ButtonGroup classNames='mie-1'>
           {userIsAuthor && editable && (
-            <Tooltip.Root>
-              <Tooltip.Trigger asChild>
-                <Button
-                  variant='ghost'
-                  data-testid={editing ? 'thread.message.save' : 'thread.message.edit'}
-                  classNames={messageControlClassNames}
-                  onClick={() => setEditing((editing) => !editing)}
-                >
-                  <span className='sr-only'>{editLabel}</span>
-                  {editing ? <Check className={getSize(4)} /> : <PencilSimple className={getSize(4)} />}
-                </Button>
-              </Tooltip.Trigger>
-              <Tooltip.Portal>
-                <Tooltip.Content>
-                  {editLabel}
-                  <Tooltip.Arrow />
-                </Tooltip.Content>
-              </Tooltip.Portal>
-            </Tooltip.Root>
+            <Tooltip.Trigger asChild content={editLabel}>
+              <Button
+                variant='ghost'
+                data-testid={editing ? 'thread.message.save' : 'thread.message.edit'}
+                classNames={messageControlClassNames}
+                onClick={() => setEditing((editing) => !editing)}
+              >
+                <span className='sr-only'>{editLabel}</span>
+                {editing ? <Check className={getSize(4)} /> : <PencilSimple className={getSize(4)} />}
+              </Button>
+            </Tooltip.Trigger>
           )}
           {onDelete && (
-            <Tooltip.Root>
-              <Tooltip.Trigger asChild>
-                <Button
-                  variant='ghost'
-                  data-testid='thread.message.delete'
-                  classNames={messageControlClassNames}
-                  onClick={() => handleDelete()}
-                >
-                  <span className='sr-only'>{deleteLabel}</span>
-                  <X className={getSize(4)} />
-                </Button>
-              </Tooltip.Trigger>
-              <Tooltip.Portal>
-                <Tooltip.Content>
-                  {deleteLabel}
-                  <Tooltip.Arrow />
-                </Tooltip.Content>
-              </Tooltip.Portal>
-            </Tooltip.Root>
+            <Tooltip.Trigger asChild content={deleteLabel}>
+              <Button
+                variant='ghost'
+                data-testid='thread.message.delete'
+                classNames={messageControlClassNames}
+                onClick={() => handleDelete()}
+              >
+                <span className='sr-only'>{deleteLabel}</span>
+                <X className={getSize(4)} />
+              </Button>
+            </Tooltip.Trigger>
           )}
         </ButtonGroup>
       </MessageHeading>
@@ -124,7 +105,7 @@ const TextboxBlock = ({
   isAuthor,
   editing,
 }: {
-  block: TextContentBlock;
+  block: DataType.MessageBlock.Text;
   editing?: boolean;
   isAuthor?: boolean;
   identity?: Identity;
@@ -166,7 +147,7 @@ const TextboxBlock = ({
   return <div role='none' ref={parentRef} className='mie-4' {...focusAttributes} />;
 };
 
-const MessageBlockObjectTile = forwardRef<HTMLDivElement, { subject: ReactiveEchoObject<any> }>(
+const MessageBlockObjectTile = forwardRef<HTMLDivElement, { subject: AnyLiveObject<any> }>(
   ({ subject }, forwardedRef) => {
     let title = subject.name ?? subject.title ?? subject.type ?? 'Object';
     if (typeof title !== 'string') {

package/src/components/testing.ts

@@ -7,14 +7,14 @@ import { live, makeRef } from '@dxos/live-object';
 import { ThreadType } from '@dxos/plugin-space/types';
 import { faker } from '@dxos/random';
 import { type Identity } from '@dxos/react-client/halo';
-import { MessageType } from '@dxos/schema';
+import { DataType } from '@dxos/schema';
 
 export const createCommentThread = (identity: Identity) => {
   return live(ThreadType, {
     messages: faker.helpers.multiple(
       () =>
         makeRef(
-          live(MessageType, {
+          live(DataType.Message, {
             sender: {
               identityDid: faker.datatype.boolean() ? identity.did : IdentityDid.random(),
             },

package/src/components/types.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type ReactiveEchoObject } from '@dxos/client/echo';
+import { type AnyLiveObject } from '@dxos/client/echo';
 import { type ThreadType } from '@dxos/plugin-space/types';
 import { type ThreadProps } from '@dxos/react-ui-thread';
 
@@ -20,7 +20,7 @@ import { type ThreadProps } from '@dxos/react-ui-thread';
  */
 export type ThreadContainerProps = {
   thread: ThreadType;
-  context?: ReactiveEchoObject<any>;
+  context?: AnyLiveObject<any>;
   autoFocusTextbox?: boolean;
   onTextboxFocus?: () => void;
   detached?: boolean;

package/src/hooks/analytics.ts

@@ -9,9 +9,13 @@ import { type Live } from '@dxos/live-object';
 import { ObservabilityAction } from '@dxos/plugin-observability/types';
 import { getSpace } from '@dxos/react-client/echo';
 import { useOnTransition } from '@dxos/react-ui';
-import { type TextContentBlock } from '@dxos/schema';
+import { type DataType } from '@dxos/schema';
 
-export const useOnEditAnalytics = (message: Live<any>, textBlock: TextContentBlock | undefined, editing: boolean) => {
+export const useOnEditAnalytics = (
+  message: Live<any>,
+  textBlock: DataType.MessageBlock.Text | undefined,
+  editing: boolean,
+) => {
   const { dispatchPromise: dispatch } = useIntentDispatcher();
 
   const onEdit = useCallback(() => {

package/src/translations.ts

@@ -27,9 +27,9 @@ export default [
         'comments heading': 'Comments',
         'chat heading': 'Chat',
         'draft button': 'DRAFT',
-        'no comments title': 'No comments (yet)',
+        'no comments title': 'Comments',
         'no comments message':
-          'To start a comment thread, select a range of text in a document and click the <commentIcon></commentIcon> Create comment button in the toolbar.',
+          'Click on the <commentIcon></commentIcon> button in the document toolbar to create a comment thread on the selected text.',
         'toggle show resolved': 'Show resolved',
         'unnamed object threads label': 'Threads',
         'mark as resolved label': 'Mark as resolved',

package/src/types.ts

@@ -2,86 +2,86 @@
 // Copyright 2023 DXOS.org
 //
 
-import { S } from '@dxos/echo-schema';
+import { Schema } from 'effect';
+
+import { Type } from '@dxos/echo';
 import { ChannelType, ThreadType } from '@dxos/plugin-space/types';
 import { EchoObjectSchema } from '@dxos/react-client/echo';
-import { ActorSchema, MessageType } from '@dxos/schema';
+import { DataType } from '@dxos/schema';
 
 import { THREAD_PLUGIN } from './meta';
 
 export namespace ThreadAction {
   const THREAD_ACTION = `${THREAD_PLUGIN}/action`;
 
-  export class CreateChannel extends S.TaggedClass<CreateChannel>()(`${THREAD_ACTION}/create-channel`, {
-    input: S.Struct({
-      // TODO(wittjosiah): Should be SpaceId.
-      spaceId: S.String,
-      name: S.optional(S.String),
+  export class CreateChannel extends Schema.TaggedClass<CreateChannel>()(`${THREAD_ACTION}/create-channel`, {
+    input: Schema.Struct({
+      spaceId: Type.SpaceId,
+      name: Schema.optional(Schema.String),
     }),
-    output: S.Struct({
+    output: Schema.Struct({
       object: ChannelType,
     }),
   }) {}
 
-  export class Create extends S.TaggedClass<Create>()(`${THREAD_ACTION}/create`, {
-    input: S.Struct({
-      name: S.optional(S.String),
-      cursor: S.String,
+  export class Create extends Schema.TaggedClass<Create>()(`${THREAD_ACTION}/create`, {
+    input: Schema.Struct({
+      name: Schema.optional(Schema.String),
+      cursor: Schema.String,
       subject: EchoObjectSchema,
     }),
-    output: S.Struct({
+    output: Schema.Struct({
       object: ThreadType,
     }),
   }) {}
 
-  export class Select extends S.TaggedClass<Select>()(`${THREAD_ACTION}/select`, {
-    input: S.Struct({
-      current: S.String,
+  export class Delete extends Schema.TaggedClass<Delete>()(`${THREAD_ACTION}/delete`, {
+    input: Schema.Struct({
+      thread: ThreadType,
+      subject: EchoObjectSchema,
+      cursor: Schema.optional(Schema.String),
     }),
-    output: S.Void,
+    output: Schema.Void,
   }) {}
 
-  export class ToggleResolved extends S.TaggedClass<ToggleResolved>()(`${THREAD_ACTION}/toggle-resolved`, {
-    input: S.Struct({
-      thread: ThreadType,
+  export class Select extends Schema.TaggedClass<Select>()(`${THREAD_ACTION}/select`, {
+    input: Schema.Struct({
+      current: Schema.String,
     }),
-    output: S.Void,
+    output: Schema.Void,
   }) {}
 
-  export class Delete extends S.TaggedClass<Delete>()(`${THREAD_ACTION}/delete`, {
-    input: S.Struct({
+  export class ToggleResolved extends Schema.TaggedClass<ToggleResolved>()(`${THREAD_ACTION}/toggle-resolved`, {
+    input: Schema.Struct({
       thread: ThreadType,
-      subject: EchoObjectSchema,
-      cursor: S.optional(S.String),
     }),
-    output: S.Void,
+    output: Schema.Void,
   }) {}
 
-  export class AddMessage extends S.TaggedClass<AddMessage>()(`${THREAD_ACTION}/add-message`, {
-    input: S.Struct({
+  export class AddMessage extends Schema.TaggedClass<AddMessage>()(`${THREAD_ACTION}/add-message`, {
+    input: Schema.Struct({
       subject: EchoObjectSchema,
       thread: ThreadType,
-      sender: ActorSchema,
-      text: S.String,
+      sender: DataType.Actor,
+      text: Schema.String,
     }),
-    output: S.Void,
+    output: Schema.Void,
   }) {}
 
-  export class DeleteMessage extends S.TaggedClass<DeleteMessage>()(`${THREAD_ACTION}/delete-message`, {
-    input: S.Struct({
+  export class DeleteMessage extends Schema.TaggedClass<DeleteMessage>()(`${THREAD_ACTION}/delete-message`, {
+    input: Schema.Struct({
       thread: ThreadType,
       subject: EchoObjectSchema,
-      messageId: S.String,
-      message: S.optional(MessageType),
-      messageIndex: S.optional(S.Number),
+      messageId: Schema.String,
+      message: Schema.optional(DataType.Message),
+      messageIndex: Schema.optional(Schema.Number),
     }),
-    output: S.Void,
+    output: Schema.Void,
   }) {}
 }
 
-export const ThreadSettingsSchema = S.mutable(S.Struct({}));
-
-export type ThreadSettingsProps = S.Schema.Type<typeof ThreadSettingsSchema>;
+export const ThreadSettingsSchema = Schema.mutable(Schema.Struct({}));
+export type ThreadSettingsProps = Schema.Schema.Type<typeof ThreadSettingsSchema>;
 
 export interface ThreadModel {
   root: ThreadType;