@dxos/plugin-thread 0.8.4-main.67995b8 → 0.8.4-main.ae835ea

package/src/components/MessageContainer.tsx

@@ -9,27 +9,37 @@ import { Surface } from '@dxos/app-framework';
 import { type Obj, Ref, type Type } from '@dxos/echo';
 import { PublicKey } from '@dxos/react-client';
 import { type SpaceMember } from '@dxos/react-client/echo';
-import { useIdentity, type Identity } from '@dxos/react-client/halo';
+import { type Identity, useIdentity } from '@dxos/react-client/halo';
 import { IconButton, useOnTransition, useThemeContext, useTranslation } from '@dxos/react-ui';
 import { createBasicExtensions, createThemeExtensions, useTextEditor } from '@dxos/react-ui-editor';
 import { hoverableControlItem, hoverableControls, hoverableFocusedWithinControls, mx } from '@dxos/react-ui-theme';
 import { MessageHeading, MessageRoot } from '@dxos/react-ui-thread';
 import { type DataType } from '@dxos/schema';
 
-import { commentControlClassNames } from './CommentsThreadContainer';
-import { command } from './command-extension';
 import { useOnEditAnalytics } from '../hooks';
 import { meta } from '../meta';
 import { getMessageMetadata } from '../util';
 
+import { command } from './command-extension';
+
+export const buttonGroupClassNames = 'flex flex-row items-center gap-0.5 pie-2';
+export const buttonClassNames = '!p-1 transition-opacity';
+
 export type MessageContainerProps = {
   message: DataType.Message;
   members: SpaceMember[];
   editable?: boolean;
   onDelete?: (id: string) => void;
+  onAcceptProposal?: (id: string) => void;
 };
 
-export const MessageContainer = ({ message, members, editable = false, onDelete }: MessageContainerProps) => {
+export const MessageContainer = ({
+  message,
+  members,
+  editable = false,
+  onDelete,
+  onAcceptProposal,
+}: MessageContainerProps) => {
   const { t } = useTranslation(meta.id);
   const senderIdentity = members.find(
     (member) =>
@@ -39,8 +49,11 @@ export const MessageContainer = ({ message, members, editable = false, onDelete
   const messageMetadata = getMessageMetadata(message.id, senderIdentity);
   const userIsAuthor = useIdentity()?.did === messageMetadata.authorId;
   const [editing, setEditing] = useState(false);
+  const handleEdit = useCallback(() => setEditing((editing) => !editing), []);
   const handleDelete = useCallback(() => onDelete?.(message.id), [message, onDelete]);
+  const handleAcceptProposal = useCallback(() => onAcceptProposal?.(message.id), [message, onAcceptProposal]);
   const textBlock = message.blocks.find((block) => block._tag === 'text');
+  const proposalBlock = message.blocks.find((block) => block._tag === 'proposal');
   const references = message.blocks.filter((block) => block._tag === 'reference').map((block) => block.reference);
 
   useOnEditAnalytics(message, textBlock, !!editing);
@@ -48,7 +61,7 @@ export const MessageContainer = ({ message, members, editable = false, onDelete
   return (
     <MessageRoot {...messageMetadata} classNames={[hoverableControls, hoverableFocusedWithinControls]}>
       <MessageHeading authorName={messageMetadata.authorName} timestamp={messageMetadata.timestamp}>
-        <div className='flex flex-row items-center gap-0.5'>
+        <div role='none' className={buttonGroupClassNames}>
           {userIsAuthor && editable && (
             <IconButton
               data-testid={editing ? 'thread.message.save' : 'thread.message.edit'}
@@ -56,8 +69,20 @@ export const MessageContainer = ({ message, members, editable = false, onDelete
               icon={editing ? 'ph--check--regular' : 'ph--pencil-simple--regular'}
               iconOnly
               label={t(editing ? 'save message label' : 'edit message label')}
-              classNames={[commentControlClassNames, hoverableControlItem]}
-              onClick={() => setEditing((editing) => !editing)}
+              classNames={[buttonClassNames, hoverableControlItem]}
+              onClick={handleEdit}
+            />
+          )}
+          {/* TODO(wittjosiah): Proposal controls should probably be hoisted to thread level. */}
+          {proposalBlock && onAcceptProposal && (
+            <IconButton
+              data-testid='thread.message.accept'
+              variant='ghost'
+              icon='ph--check--regular'
+              iconOnly
+              label={t('accept proposal label')}
+              classNames={[buttonClassNames, hoverableControlItem]}
+              onClick={handleAcceptProposal}
             />
           )}
           {onDelete && (
@@ -67,13 +92,14 @@ export const MessageContainer = ({ message, members, editable = false, onDelete
               icon='ph--x--regular'
               iconOnly
               label={t('delete message label')}
-              classNames={[commentControlClassNames, hoverableControlItem]}
-              onClick={() => handleDelete()}
+              classNames={[buttonClassNames, hoverableControlItem]}
+              onClick={handleDelete}
             />
           )}
         </div>
       </MessageHeading>
       {textBlock && <TextboxBlock block={textBlock} isAuthor={userIsAuthor} editing={editing} />}
+      {proposalBlock && <ProposalBlock block={proposalBlock} />}
       {Ref.Array.targets(references).map((reference, index) => (
         <MessagePart key={index} part={reference} />
       ))}
@@ -132,6 +158,14 @@ const TextboxBlock = ({
   return <div role='none' ref={parentRef} className='mie-4' {...focusAttributes} />;
 };
 
+const ProposalBlock = ({ block }: { block: DataType.MessageBlock.Proposal }) => {
+  return (
+    <div role='none' className='mie-4 italic'>
+      {block.text}
+    </div>
+  );
+};
+
 const MessageBlockObjectTile = forwardRef<HTMLDivElement, { subject: Obj.Any }>(({ subject }, forwardedRef) => {
   // TODO(burdon): Use annotation to get title.
   let title = (subject as any).name ?? (subject as any).title ?? (subject as any).type ?? 'Object';

package/src/components/Participant/Participant.tsx

@@ -17,15 +17,21 @@ export const Participant = memo(({ item: user, debug, ...props }: ResponsiveGrid
   const call = useCapability(ThreadCapabilities.CallManager);
   const isSelf: boolean = call.self.id !== undefined && user.id !== undefined && user.id.startsWith(call.self.id);
   const isScreenshare = user.id?.endsWith(SCREENSHARE_SUFFIX);
-  const pulledVideoStream = call.getVideoStream(
-    isScreenshare || !isSelf ? (user.tracks?.video as EncodedTrackName) : undefined,
-  );
+
+  const pulledVideoStream =
+    !isSelf && isScreenshare && user.tracks?.screenshareEnabled
+      ? call.getVideoStream(user.tracks?.screenshare as EncodedTrackName)
+      : !isSelf && !isScreenshare && user.tracks?.videoEnabled
+        ? call.getVideoStream(user.tracks?.video as EncodedTrackName)
+        : undefined;
 
   const videoStream = useMemo<MediaStream | undefined>(() => {
-    if (isSelf && !isScreenshare) {
-      return call.media.videoStream;
-    } else if (isSelf && isScreenshare) {
-      return call.media.screenshareVideoStream;
+    if (isSelf) {
+      if (isScreenshare) {
+        return call.media.screenshareVideoStream;
+      } else if (!isScreenshare) {
+        return call.media.videoStream;
+      }
     } else if (!isSelf) {
       return pulledVideoStream;
     }

package/src/components/Participant/ParticipantGrid.tsx

@@ -6,10 +6,11 @@ import React, { useEffect, useMemo, useState } from 'react';
 
 import { type ThemedClassName } from '@dxos/react-ui';
 
-import { Participant, SCREENSHARE_SUFFIX } from './Participant';
 import { type UserState } from '../../calls';
 import { ResponsiveGrid } from '../ResponsiveGrid';
 
+import { Participant, SCREENSHARE_SUFFIX } from './Participant';
+
 const getId = (user: UserState): string => user.id!;
 
 export type ParticipantGridProps = ThemedClassName<{

package/src/components/ResponsiveGrid/ResponsiveContainer.stories.tsx

@@ -2,25 +2,25 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type StoryObj, type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { withTheme, withLayout } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
-import { ResponsiveContainer } from './ResponsiveContainer';
 import { translations } from '../../translations';
 import { VideoObject as VideoObjectComponent } from '../Media';
 
-const meta: Meta<typeof ResponsiveContainer> = {
+import { ResponsiveContainer } from './ResponsiveContainer';
+
+const meta = {
   title: 'plugins/plugin-thread/ResponsiveContainer',
   component: ResponsiveContainer,
-  decorators: [withTheme, withLayout({ fullscreen: true })],
+  decorators: [withTheme],
   parameters: {
+    layout: 'fullscreen',
     translations,
   },
-};
+} satisfies Meta<typeof ResponsiveContainer>;
 
 export default meta;
 

package/src/components/ResponsiveGrid/ResponsiveGrid.stories.tsx

@@ -2,17 +2,16 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type StoryObj, type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useEffect, useState } from 'react';
 
 import { faker } from '@dxos/random';
-import { withTheme, withLayout } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
+
+import { translations } from '../../translations';
 
 import { ResponsiveGrid, type ResponsiveGridProps } from './ResponsiveGrid';
 import { ResponsiveGridItem, type ResponsiveGridItemProps } from './ResponsiveGridItem';
-import { translations } from '../../translations';
 
 type TestItem = {
   id: string;
@@ -56,46 +55,49 @@ const TestCell = ({ item, ...props }: ResponsiveGridItemProps<TestItem>) => {
 
 type StoryProps = ResponsiveGridProps<TestItem> & { random?: boolean; autoHideGallery?: boolean };
 
-const meta: Meta<StoryProps> = {
+const DefaultStory = (props: StoryProps) => {
+  const [pinned, setPinned] = useState<string | undefined>(
+    (props.pinned ?? props.items.length > 1) ? props.items[0]?.id : undefined,
+  );
+  const [items, setItems] = useState<TestItem[]>(props.items);
+  useEffect(() => {
+    if (!props.random) {
+      return;
+    }
+
+    const interval = setInterval(() => {
+      setItems((items) => {
+        const p = Math.random();
+        if (p < 0.5) {
+          return items;
+        } else if (p < 0.99 && items.length > 1) {
+          return items.slice(0, -1);
+        } else {
+          return [...items, createItem(items[0]?.type)];
+        }
+      });
+    }, 3_000);
+
+    return () => clearInterval(interval);
+  }, []);
+
+  return (
+    <div className='grid grow p-4'>
+      <ResponsiveGrid {...props} Cell={TestCell} items={items} pinned={pinned} onPinnedChange={setPinned} />
+    </div>
+  );
+};
+
+const meta = {
   title: 'plugins/plugin-thread/ResponsiveGrid',
-  component: ResponsiveGrid,
-  render: (args) => {
-    const [pinned, setPinned] = useState<string | undefined>(
-      (args.pinned ?? args.items.length > 1) ? args.items[0]?.id : undefined,
-    );
-    const [items, setItems] = useState<TestItem[]>(args.items);
-    useEffect(() => {
-      if (!args.random) {
-        return;
-      }
-
-      const interval = setInterval(() => {
-        setItems((items) => {
-          const p = Math.random();
-          if (p < 0.5) {
-            return items;
-          } else if (p < 0.99 && items.length > 1) {
-            return items.slice(0, -1);
-          } else {
-            return [...items, createItem(items[0]?.type)];
-          }
-        });
-      }, 3_000);
-
-      return () => clearInterval(interval);
-    }, []);
-
-    return (
-      <div className='grid grow p-4'>
-        <ResponsiveGrid {...args} Cell={TestCell} items={items} pinned={pinned} onPinnedChange={setPinned} />
-      </div>
-    );
-  },
-  decorators: [withTheme, withLayout({ fullscreen: true, classNames: 'justify-center' })],
+  component: ResponsiveGrid as any,
+  render: DefaultStory,
+  decorators: [withTheme],
   parameters: {
+    layout: 'fullscreen',
     translations,
   },
-};
+} satisfies Meta<typeof DefaultStory>;
 
 const videoUrls = [
   'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerBlazes.mp4',
@@ -117,7 +119,7 @@ const createItem = (type?: 'image' | 'video') => {
 
 export default meta;
 
-type Story = StoryObj<StoryProps>;
+type Story = StoryObj<typeof meta>;
 
 // TODO(burdon): Story to join/leave repeatedly to test stable position.
 

package/src/components/ResponsiveGrid/ResponsiveGrid.tsx

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { type ComponentType, type FC, useLayoutEffect, useState, useEffect, useMemo, useCallback } from 'react';
+import React, { type ComponentType, type FC, useCallback, useEffect, useLayoutEffect, useMemo, useState } from 'react';
 import { useResizeDetector } from 'react-resize-detector';
 
 import { invariant } from '@dxos/invariant';

package/src/components/ResponsiveGrid/ResponsiveGridItem.tsx

@@ -2,9 +2,9 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { useEffect, useState, type CSSProperties, type PropsWithChildren } from 'react';
+import React, { type CSSProperties, type PropsWithChildren, useEffect, useState } from 'react';
 
-import { Icon, IconButton, useTranslation, type ThemedClassName } from '@dxos/react-ui';
+import { Icon, IconButton, type ThemedClassName, useTranslation } from '@dxos/react-ui';
 import { Waveform } from '@dxos/react-ui-sfx';
 import { groupHoverControlItemWithTransition, mx } from '@dxos/react-ui-theme';
 

package/src/components/ThreadComplementary.tsx

@@ -6,25 +6,27 @@ import React, { useCallback, useMemo } from 'react';
 
 import {
   Capabilities,
+  CollaborationActions,
   LayoutAction,
   createIntent,
-  useCapability,
   useCapabilities,
+  useCapability,
   useIntentDispatcher,
 } from '@dxos/app-framework';
 import { Filter, Obj, Query, Relation } from '@dxos/echo';
-import { fullyQualifiedId, getSpace, useQuery } from '@dxos/react-client/echo';
+import { Ref, fullyQualifiedId, getSpace, useQuery } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { useThemeContext, useTranslation } from '@dxos/react-ui';
 import { useAttended } from '@dxos/react-ui-attention';
 import { StackItem } from '@dxos/react-ui-stack';
 import { Tabs } from '@dxos/react-ui-tabs';
+import { mx } from '@dxos/react-ui-theme';
 import { AnchoredTo } from '@dxos/schema';
 
 import { ThreadCapabilities } from '../capabilities';
-import { CommentsContainer } from '../components';
+import { CommentsContainer, type CommentsContainerProps } from '../components';
 import { meta } from '../meta';
-import { ThreadAction, ThreadType } from '../types';
+import { Thread, ThreadAction } from '../types';
 
 export const ThreadComplementary = ({ subject }: { subject: any }) => {
   const { t } = useTranslation(meta.id);
@@ -54,14 +56,14 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
   const objectsAnchoredTo = useQuery(space, Query.select(Filter.ids(subject.id)).targetOf(AnchoredTo));
   const anchors = objectsAnchoredTo
     .toSorted((a, b) => sort?.(a, b) ?? 0)
-    .filter((anchor) => Obj.instanceOf(ThreadType, Relation.getSource(anchor)))
+    .filter((anchor) => Obj.instanceOf(Thread.Thread, Relation.getSource(anchor)))
     .concat(drafts ?? []);
 
   const attended = useAttended();
 
   const handleAttend = useCallback(
     (anchor: AnchoredTo) => {
-      const thread = Relation.getSource(anchor) as ThreadType;
+      const thread = Relation.getSource(anchor) as Thread.Thread;
       const threadId = fullyQualifiedId(thread);
 
       if (state.current !== threadId) {
@@ -91,7 +93,7 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
         createIntent(ThreadAction.AddMessage, { anchor, subject, sender: { identityDid: identity?.did }, text }),
       );
 
-      const thread = Relation.getSource(anchor) as ThreadType;
+      const thread = Relation.getSource(anchor) as Thread.Thread;
       state.current = fullyQualifiedId(thread);
     },
     [dispatch, identity, subject],
@@ -99,7 +101,7 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
 
   const handleResolve = useCallback(
     (anchor: AnchoredTo) =>
-      dispatch(createIntent(ThreadAction.ToggleResolved, { thread: Relation.getSource(anchor) as ThreadType })),
+      dispatch(createIntent(ThreadAction.ToggleResolved, { thread: Relation.getSource(anchor) as Thread.Thread })),
     [dispatch],
   );
 
@@ -114,6 +116,28 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
     [dispatch, subject],
   );
 
+  const handleAcceptProposal = useCallback<NonNullable<CommentsContainerProps['onAcceptProposal']>>(
+    async (anchor, messageId) => {
+      const thread = Relation.getSource(anchor) as Thread.Thread;
+      const messageIndex = thread.messages.findIndex(Ref.hasObjectId(messageId));
+      const message = thread.messages[messageIndex]?.target;
+      const proposal = message?.blocks.find((block) => block._tag === 'proposal');
+      if (!proposal || !anchor.anchor) {
+        return;
+      }
+
+      await dispatch(
+        createIntent(CollaborationActions.AcceptProposal, {
+          subject,
+          anchor: anchor.anchor,
+          proposal,
+        }),
+      );
+      await dispatch(createIntent(ThreadAction.ToggleResolved, { thread }));
+    },
+    [dispatch, subject],
+  );
+
   const comments = (
     <CommentsContainer
       anchors={anchors}
@@ -124,6 +148,7 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
       onResolve={handleResolve}
       onMessageDelete={handleMessageDelete}
       onThreadDelete={handleThreadDelete}
+      onAcceptProposal={handleAcceptProposal}
     />
   );
 
@@ -132,10 +157,13 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
       <Tabs.Root
         value={showResolvedThreads ? 'all' : 'unresolved'}
         orientation='horizontal'
-        classNames='contents [&_[role="tabpanel"]]:min-bs-0 [&_[role="tabpanel"]]:overflow-y-auto [&_[role="tabpanel"]]:scrollbar-thin'
+        classNames={[
+          'contents [&_[role="tabpanel"]]:min-bs-0 [&_[role="tabpanel"]]:overflow-y-auto [&_[role="tabpanel"]]:scrollbar-thin',
+        ]}
         onValueChange={onChangeViewState}
       >
-        <Tabs.Tablist classNames={tx('toolbar.root', 'toolbar', {})}>
+        {/* TODO(burdon): Standardize (like Tollbar). */}
+        <Tabs.Tablist classNames={mx('bg-toolbarSurface border-b border-subduedSeparator')}>
           <Tabs.Tab value='unresolved' classNames='text-sm'>
             {t('show unresolved label')}
           </Tabs.Tab>
@@ -143,8 +171,10 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
             {t('show all label')}
           </Tabs.Tab>
         </Tabs.Tablist>
-        <Tabs.Tabpanel value='all'>{showResolvedThreads && comments}</Tabs.Tabpanel>
-        <Tabs.Tabpanel value='unresolved'>{!showResolvedThreads && comments}</Tabs.Tabpanel>
+        <div className='overflow-y-auto'>
+          <Tabs.Tabpanel value='all'>{showResolvedThreads && comments}</Tabs.Tabpanel>
+          <Tabs.Tabpanel value='unresolved'>{!showResolvedThreads && comments}</Tabs.Tabpanel>
+        </div>
       </Tabs.Root>
     </StackItem.Content>
   );

package/src/components/ThreadSettings.tsx

@@ -4,14 +4,13 @@
 
 import React from 'react';
 
-// import { useTranslation } from '@dxos/react-ui';
-import { DeprecatedFormContainer } from '@dxos/react-ui-form';
+import { useTranslation } from '@dxos/react-ui';
+import { ControlPage } from '@dxos/react-ui-form';
 
-// import { meta } from '../meta';
+import { meta } from '../meta';
 import type { ThreadSettingsProps } from '../types';
 
-export const ThreadSettings = ({ settings }: { settings: ThreadSettingsProps }) => {
-  // const { t } = useTranslation(meta.id);
-
-  return <DeprecatedFormContainer></DeprecatedFormContainer>;
+export const ThreadSettings = ({ settings: _settings }: { settings: ThreadSettingsProps }) => {
+  const { t: _t } = useTranslation(meta.id);
+  return <ControlPage></ControlPage>;
 };

package/src/components/command-extension.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { StreamLanguage, HighlightStyle, syntaxHighlighting } from '@codemirror/language';
+import { HighlightStyle, StreamLanguage, syntaxHighlighting } from '@codemirror/language';
 import { type Extension } from '@codemirror/state';
 
 import { tags } from '@dxos/react-ui-editor';
@@ -27,7 +27,10 @@ const parser = StreamLanguage.define<{ count: number }>({
 });
 
 const styles = HighlightStyle.define([
-  { tag: tags.tagName, class: mx('dx-tag dx-tag--indigo text-baseText font-medium') },
+  {
+    tag: tags.tagName,
+    class: mx('dx-tag dx-tag--indigo text-baseText font-medium'),
+  },
 ]);
 
 export const command: Extension = [parser, syntaxHighlighting(styles)];

package/src/components/testing.ts

@@ -8,10 +8,11 @@ import { faker } from '@dxos/random';
 import { type Identity } from '@dxos/react-client/halo';
 import { DataType } from '@dxos/schema';
 
-import { ThreadType } from '../types';
+import { Thread } from '../types';
 
-export const createCommentThread = (identity: Identity): ThreadType => {
-  return Obj.make(ThreadType, {
+export const createCommentThread = (identity: Identity): Thread.Thread => {
+  return Thread.make({
+    name: 'Comment',
     messages: faker.helpers.multiple(
       () =>
         Ref.make(
@@ -25,5 +26,26 @@ export const createCommentThread = (identity: Identity): ThreadType => {
         ),
       { count: { min: 2, max: 3 } },
     ),
+    status: 'active',
+  });
+};
+
+export const createProposalThread = (identity: Identity): Thread.Thread => {
+  return Thread.make({
+    name: 'Proposal',
+    messages: faker.helpers.multiple(
+      () =>
+        Ref.make(
+          Obj.make(DataType.Message, {
+            created: new Date().toISOString(),
+            sender: {
+              identityDid: faker.datatype.boolean() ? identity.did : IdentityDid.random(),
+            },
+            blocks: [{ _tag: 'proposal', text: faker.lorem.sentences(3) }],
+          }),
+        ),
+      { count: { min: 1, max: 1 } },
+    ),
+    status: 'active',
   });
 };

package/src/extensions/threads.ts

@@ -6,14 +6,14 @@ import { type Extension } from '@codemirror/state';
 import { EditorView } from '@codemirror/view';
 import { computed, effect } from '@preact/signals-core';
 
-import { createIntent, type PromiseIntentDispatcher } from '@dxos/app-framework';
+import { type PromiseIntentDispatcher, createIntent } from '@dxos/app-framework';
 import { Filter, Obj, Query, Relation } from '@dxos/echo';
 import { type Markdown } from '@dxos/plugin-markdown/types';
-import { getSpace, getTextInRange, createDocAccessor, fullyQualifiedId, getSource } from '@dxos/react-client/echo';
+import { createDocAccessor, fullyQualifiedId, getSource, getSpace, getTextInRange } from '@dxos/react-client/echo';
 import { comments, createExternalCommentSync } from '@dxos/react-ui-editor';
 import { AnchoredTo } from '@dxos/schema';
 
-import { ThreadAction, ThreadType, type ThreadState } from '../types';
+import { Thread, ThreadAction, type ThreadState } from '../types';
 
 // TODO(burdon): Factor out.
 const getName = (doc: Markdown.Document, anchor: string): string | undefined => {
@@ -41,7 +41,7 @@ export const threads = (state: ThreadState, doc?: Markdown.Document, dispatch?:
     query.objects
       .filter((anchor) => {
         const thread = Relation.getSource(anchor);
-        return Obj.instanceOf(ThreadType, thread) && thread.status !== 'resolved';
+        return Obj.instanceOf(Thread.Thread, thread) && thread.status !== 'resolved';
       })
       .concat(state.drafts[fullyQualifiedId(doc)] ?? []),
   );
@@ -60,7 +60,7 @@ export const threads = (state: ThreadState, doc?: Markdown.Document, dispatch?:
             // 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, anchor.anchor);
-            const thread = Relation.getSource(anchor) as ThreadType;
+            const thread = Relation.getSource(anchor) as Thread.Thread;
             if (name && name !== thread.name) {
               thread.name = name;
             }
@@ -101,7 +101,7 @@ export const threads = (state: ThreadState, doc?: Markdown.Document, dispatch?:
       onUpdate: ({ id, cursor }) => {
         const draft = state.drafts[fullyQualifiedId(doc)]?.find((thread) => fullyQualifiedId(thread) === id);
         if (draft) {
-          const thread = Relation.getSource(draft) as ThreadType;
+          const thread = Relation.getSource(draft) as Thread.Thread;
           thread.name = getName(doc, cursor);
           draft.anchor = cursor;
         }
@@ -109,7 +109,7 @@ export const threads = (state: ThreadState, doc?: Markdown.Document, dispatch?:
         const relation = query.objects.find((object) => getSource(object).id === id);
         if (relation) {
           const thread = getSource(relation);
-          if (Obj.instanceOf(ThreadType, thread)) {
+          if (Obj.instanceOf(Thread.Thread, thread)) {
             thread.name = getName(doc, cursor);
             relation.anchor = cursor;
           }

package/src/hooks/index.ts

@@ -7,3 +7,4 @@ export * from './useDebugMode';
 export * from './useStatus';
 export * from './useVideoStreamTrack';
 export * from './useInaudibleAudioStreamTrack';
+export * from './useBlackCanvasStreamTrack';

package/src/hooks/useBlackCanvasStreamTrack.tsx

@@ -0,0 +1,27 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { useEffect, useState } from 'react';
+
+import { scheduleTask } from '@dxos/async';
+import { Context } from '@dxos/context';
+
+import { createBlackCanvasStreamTrack } from '../calls/util/stub-media-streams';
+
+export const useBlackCanvasStreamTrack = () => {
+  const [blackCanvasStreamTrack, setBlackCanvasStreamTrack] = useState<MediaStreamTrack | undefined>(undefined);
+  useEffect(() => {
+    const ctx = new Context();
+    scheduleTask(ctx, async () => {
+      const blackCanvasStreamTrack = await createBlackCanvasStreamTrack({ ctx, width: 720, height: 480 });
+      setBlackCanvasStreamTrack(blackCanvasStreamTrack);
+    });
+
+    return () => {
+      void ctx.dispose();
+    };
+  }, []);
+
+  return blackCanvasStreamTrack;
+};

package/src/hooks/useDebugMode.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
 
 // TODO(burdon): Standardize across plugins/composer.
 export const useDebugMode = () => {