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

package/src/components/CallDebugPanel.tsx

@@ -2,15 +2,15 @@
 // Copyright 2024 DXOS.org
 //
 
-import { WebRTCStats } from '@peermetrics/webrtc-stats';
+import { WebRTCStats, type WebRTCStatsEvent } from '@peermetrics/webrtc-stats';
 import React, { useEffect, useMemo, useState } from 'react';
 
-import { Panel } from '@dxos/devtools';
+import { truncateKey } from '@dxos/debug';
+import { JsonView, Panel } from '@dxos/devtools';
 import { log } from '@dxos/log';
-import { Input, useTranslation, type ThemedClassName } from '@dxos/react-ui';
-import { Json } from '@dxos/react-ui-syntax-highlighter';
+import { IconButton, Input, type ThemedClassName, useTranslation } from '@dxos/react-ui';
 
-import { type GlobalState } from '../calls';
+import { type EncodedTrackName, type GlobalState } from '../calls';
 import { meta } from '../meta';
 
 export type CallDebugPanelProps = ThemedClassName<{
@@ -19,11 +19,16 @@ export type CallDebugPanelProps = ThemedClassName<{
 
 export const CallDebugPanel = ({ state }: CallDebugPanelProps) => {
   const { t } = useTranslation(meta.id);
-  const users = state?.call?.users;
-  const self = state?.call?.self;
 
   const [open, setOpen] = useState(false);
   const handleToggle = () => setOpen(!open);
+  const [showServiceHistory, setShowServiceHistory] = useState(false);
+  const handleToggleServiceHistory = () => setShowServiceHistory(!showServiceHistory);
+
+  const handleCopyRaw = async () => {
+    await navigator.clipboard.writeText(JSON.stringify({ users: state?.call?.users, stats }, null, 2));
+  };
+
   const [showDetailedWebRTCStats, setShowDetailedWebRTCStats] = useState(false);
   const handleShowDetailedWebRTCStats = () => setShowDetailedWebRTCStats(!showDetailedWebRTCStats);
 
@@ -34,22 +39,24 @@ export const CallDebugPanel = ({ state }: CallDebugPanelProps) => {
       }),
     [],
   );
+  const [stats, setStats] = useState<WebRTCStatsEvent['data']>();
 
-  const [stats, setStats] = useState<Record<string, any>>({});
   useEffect(() => {
     const pc = state?.media.peer?.session?.peerConnection;
-    const handleStats = (stats: Record<string, any>) => setStats(stats.data);
+    const handleStats = (stats: WebRTCStatsEvent) => {
+      setStats(stats.data);
+    };
     let added = false;
     if (pc && showDetailedWebRTCStats) {
       webrtcStats.addConnection({ pc, peerId: 1, connectionId: '1' });
-      webrtcStats.on('stats', handleStats);
+      webrtcStats.on('stats', handleStats as never);
       added = true;
     }
     return () => {
       try {
         if (pc && added) {
           webrtcStats.removeConnection({ pc });
-          webrtcStats.removeListener('stats', handleStats);
+          webrtcStats.removeListener('stats', handleStats as never);
         }
       } catch (error) {
         log.error('error removing webrtc stats', { error, pc, peerId: 1, connectionId: '1' });
@@ -57,6 +64,8 @@ export const CallDebugPanel = ({ state }: CallDebugPanelProps) => {
     };
   }, [state?.media.peer?.session?.peerConnection, showDetailedWebRTCStats]);
 
+  const rows = useMemo(() => getCallStatusTable(state), [state?.call.users, state?.media.pulledAudioTracks]);
+
   return (
     <Panel
       id='meeting-status'
@@ -65,51 +74,101 @@ export const CallDebugPanel = ({ state }: CallDebugPanelProps) => {
       onToggle={handleToggle}
       title={t('meeting status title')}
       maxHeight={false}
-      info={
-        <div className='flex items-center gap-2'>
-          <span title='Joined'>{self?.joined ? 'Active' : 'Inactive'}</span>
-          {users?.length !== undefined && <span title='Users'>{users?.length ?? 0} User(s)</span>}
-        </div>
-      }
+      info={<div className='flex items-center gap-2'> {state?.call.joined ? 'Active' : 'Inactive'}</div>}
     >
-      <div className='flex flex-col gap-2 overflow-y-auto'>
-        <div className='flex items-row gap-2'>
+      <div className='flex flex-col w-full gap-2 text-xs'>
+        <div className='flex items-center gap-2'>
           <Input.Root>
             <Input.Label classNames={'text-sm'}>{t('show webrtc stats title')}</Input.Label>
             <Input.Checkbox checked={showDetailedWebRTCStats} onCheckedChange={handleShowDetailedWebRTCStats} />
           </Input.Root>
         </div>
-        <Json
-          classNames='text-sm'
-          data={{
-            users,
-            activities: state?.call?.activities,
-            ...(showDetailedWebRTCStats
-              ? {
-                  webrtc: {
-                    connectionState: state?.media.peer?.session?.peerConnection.connectionState,
-                    iceConnectionState: state?.media.peer?.session?.peerConnection.iceConnectionState,
-                    stats,
-                  },
-                }
-              : {}),
-            tracks: state?.media.peer?.session?.peerConnection.getTransceivers().map((transceiver) => {
-              const track =
-                transceiver.direction === 'recvonly' ? transceiver.receiver.track : transceiver.sender.track;
-              return {
-                id: track?.id,
-                kind: track?.kind,
-                direction: transceiver.direction,
-                enabled: track?.enabled,
-                muted: track?.muted,
-                readyState: track?.readyState,
-                settings: track?.getSettings(),
-              };
-            }),
-            callsServiceHistory: state?.media.peer?.history.get(),
-          }}
-        />
+        <div className='flex items-center gap-2'>
+          <Input.Root>
+            <Input.Label classNames={'text-sm'}>{t('show calls history title')}</Input.Label>
+            <Input.Checkbox checked={showServiceHistory} onCheckedChange={handleToggleServiceHistory} />
+          </Input.Root>
+        </div>
+        <div className='flex items-center gap-2'>
+          <IconButton classNames={'text-sm'} icon='ph--copy--regular' label={'copy raw'} onClick={handleCopyRaw} />
+        </div>
+        <Table rows={rows} />
+        {showDetailedWebRTCStats && <JsonView data={{ stats }} />}
+        {showServiceHistory && <JsonView data={{ history: state?.media.peer?.history.get() }} />}
       </div>
     </Panel>
   );
 };
+
+const getCallStatusTable = (state?: GlobalState): TableProps['rows'] => {
+  if (!state || !state.call?.users) {
+    return [];
+  }
+
+  const self = state.call.self;
+  const users = state.call.users
+    .filter((user) => user.id !== self!.id)
+    .map((user) => {
+      const isOk = {
+        audio:
+          user.tracks?.audio &&
+          state.media.pulledAudioTracks[user.tracks?.audio as EncodedTrackName]?.ctx.disposed === false,
+        video:
+          user.tracks?.video &&
+          state.media.pulledVideoStreams[user.tracks?.video as EncodedTrackName]?.ctx.disposed === false,
+        screenshare:
+          user.tracks?.screenshare &&
+          state.media.pulledVideoStreams[user.tracks?.screenshare as EncodedTrackName]?.ctx.disposed === false,
+      };
+
+      return {
+        ...user,
+        isOk,
+      };
+    });
+
+  return [
+    ['users', state.call.users.length ?? 0],
+    [
+      '*self* ' + (self?.name ?? truncateKey(self!.id, 8)),
+      self?.tracks?.audio && state.media.pushedAudioTrack ? 'AUD ✅' : 'AUD ❌',
+      self?.tracks?.video && state.media.pushedVideoTrack ? 'VID ✅' : 'VID ❌',
+      self?.tracks?.screenshareEnabled
+        ? self.tracks.screenshareEnabled && state.media.pushedScreenshareTrack
+          ? 'SCR ✅'
+          : 'SCR ❌'
+        : undefined,
+    ],
+
+    ...users.map((user) => [
+      user.name ?? truncateKey(user.id, 8),
+      user.isOk.audio ? 'AUD ✅' : 'AUD ❌',
+      user.isOk.video ? 'VID ✅' : 'VID ❌',
+      user.tracks?.screenshareEnabled ? (user.isOk.screenshare ? 'SCR ✅' : 'SCR ❌') : undefined,
+    ]),
+    ['ICE', state.media.peer?.session?.peerConnection.iceConnectionState ?? 'no connection'],
+  ];
+};
+
+export namespace Unit {
+  export const KB = (n?: number) => ((n ?? 0) / 1_000).toFixed(2);
+}
+
+export type TableProps = {
+  rows: (string | number | undefined)[][];
+};
+
+export const Table = ({ rows }: TableProps) => {
+  return (
+    <div className='w-full text-xs font-mono'>
+      {rows.map(([prefix, label, value, unit], i) => (
+        <div key={i} className='grid grid-cols-[3fr_1fr_1fr_1fr]'>
+          <div className='p-1'>{prefix}</div>
+          <div className='p-1'>{label}</div>
+          <div className='p-1'>{value}</div>
+          <div className='p-1'>{unit}</div>
+        </div>
+      ))}
+    </div>
+  );
+};

package/src/components/CallSidebar.tsx

@@ -6,9 +6,10 @@ import React from 'react';
 
 import { useCapability } from '@dxos/app-framework';
 
-import { ChannelContainer } from './ChannelContainer';
 import { ThreadCapabilities } from '../capabilities';
 
+import { ChannelContainer } from './ChannelContainer';
+
 export const CallSidebar = () => {
   const call = useCapability(ThreadCapabilities.CallManager);
   return <ChannelContainer roomId={call.roomId} />;

package/src/components/ChannelContainer.stories.tsx

@@ -12,13 +12,14 @@ import { withPluginManager } from '@dxos/app-framework/testing';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { Query, useQuery, useSpace } from '@dxos/react-client/echo';
 import { DataType } from '@dxos/schema';
-import { withLayout, ColumnContainer } from '@dxos/storybook-utils';
+import { ColumnContainer, withLayout } from '@dxos/storybook-utils';
 
-import { ChannelContainer, type ChannelContainerProps } from './ChannelContainer';
 import { createThreadPlugins } from '../testing';
 import { translations } from '../translations';
 import { ChannelType, ThreadType } from '../types';
 
+import { ChannelContainer, type ChannelContainerProps } from './ChannelContainer';
+
 // TODO(wittjosiah): Channel doesn't render full height.
 const Story = ({ roomId }: ChannelContainerProps) => {
   const space = useSpace();
@@ -30,7 +31,7 @@ const Story = ({ roomId }: ChannelContainerProps) => {
   return <ChannelContainer channel={channel} roomId={roomId} />;
 };
 
-const meta: Meta<ChannelContainerProps> = {
+const meta = {
   title: 'plugins/plugin-thread/ChannelContainer',
   component: ChannelContainer,
   render: (args) => <Story {...args} />,
@@ -44,11 +45,11 @@ const meta: Meta<ChannelContainerProps> = {
   parameters: {
     translations,
   },
-};
+} satisfies Meta<typeof ChannelContainer>;
 
 export default meta;
 
-type Story = StoryObj<ChannelContainerProps>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {

package/src/components/ChannelContainer.tsx

@@ -3,7 +3,7 @@
 //
 
 import { Rx } from '@effect-rx/rx-react';
-import React, { useCallback, useEffect, useMemo, useState, type ChangeEvent } from 'react';
+import React, { type ChangeEvent, useCallback, useEffect, useMemo, useState } from 'react';
 
 import { useCapabilities, useCapability } from '@dxos/app-framework';
 import { Context } from '@dxos/context';
@@ -12,18 +12,19 @@ import { log } from '@dxos/log';
 import { useClient } from '@dxos/react-client';
 import { fullyQualifiedId, getSpace } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
-import { useTranslation, Input, ElevationProvider, type ThemedClassName } from '@dxos/react-ui';
-import { ControlGroup, ControlItemInput, ControlGroupButton } from '@dxos/react-ui-form';
-import { ToolbarMenu, MenuProvider, createMenuAction, useMenuActions, createMenuItemGroup } from '@dxos/react-ui-menu';
+import { ElevationProvider, Input, type ThemedClassName, useTranslation } from '@dxos/react-ui';
+import { ControlGroup, ControlGroupButton, ControlItemInput } from '@dxos/react-ui-form';
+import { MenuProvider, ToolbarMenu, createMenuAction, createMenuItemGroup, useMenuActions } from '@dxos/react-ui-menu';
 import { useSoundEffect } from '@dxos/react-ui-sfx';
 import { StackItem } from '@dxos/react-ui-stack';
 
-import { Call } from './Call';
-import ChatContainer from './ChatContainer';
 import { ThreadCapabilities } from '../capabilities';
 import { meta } from '../meta';
 import { type ChannelType } from '../types';
 
+import { Call } from './Call';
+import ChatContainer from './ChatContainer';
+
 export type ChannelContainerProps = {
   channel?: ChannelType;
   roomId?: string;

package/src/components/Chat.stories.tsx

@@ -4,10 +4,10 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react-vite';
-import React, { useEffect, useState } from 'react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React, { useState } from 'react';
 
-import { Capabilities, contributes, createSurface, IntentPlugin } from '@dxos/app-framework';
+import { Capabilities, IntentPlugin, contributes, createSurface } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Obj, Ref } from '@dxos/echo';
 import { faker } from '@dxos/random';
@@ -15,35 +15,35 @@ import { useClient } from '@dxos/react-client';
 import { type Space } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { withClientProvider } from '@dxos/react-client/testing';
+import { useAsyncEffect } from '@dxos/react-ui';
 import { Thread } from '@dxos/react-ui-thread';
 import { DataType } from '@dxos/schema';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { render, withLayout, withTheme } from '@dxos/storybook-utils';
 
-import { ChatContainer } from './ChatContainer';
 import { translations } from '../translations';
 import { ChannelType, ThreadType } from '../types';
 
+import { ChatContainer } from './ChatContainer';
+
 faker.seed(1);
 
-const Story = () => {
+const DefaultStory = () => {
   const client = useClient();
   const identity = useIdentity();
   const [space, setSpace] = useState<Space>();
   const [channel, setChannel] = useState<ChannelType | null>();
 
-  useEffect(() => {
+  useAsyncEffect(async () => {
     if (identity) {
-      setTimeout(async () => {
-        const space = await client.spaces.create();
-        const channel = space.db.add(
-          Obj.make(ChannelType, {
-            defaultThread: Ref.make(Obj.make(ThreadType, { messages: [], status: 'active' })),
-            threads: [],
-          }),
-        );
-        setSpace(space);
-        setChannel(channel);
-      });
+      const space = await client.spaces.create();
+      const channel = space.db.add(
+        Obj.make(ChannelType, {
+          defaultThread: Ref.make(Obj.make(ThreadType, { messages: [], status: 'active' })),
+          threads: [],
+        }),
+      );
+      setSpace(space);
+      setChannel(channel);
     }
   }, [identity]);
 
@@ -52,18 +52,16 @@ const Story = () => {
   }
 
   return (
-    <main className='max-is-prose mli-auto bs-dvh overflow-hidden'>
+    <main className='is-full max-is-prose mli-auto bs-dvh overflow-hidden'>
       <ChatContainer space={space} thread={channel.defaultThread.target} />
     </main>
   );
 };
 
-export const Default = {};
-
-const meta: Meta<typeof Thread.Root> = {
+const meta = {
   title: 'plugins/plugin-thread/Chat',
-  component: Thread.Root,
-  render: () => <Story />,
+  component: Thread.Root as any,
+  render: render(DefaultStory),
   decorators: [
     withPluginManager({
       plugins: [IntentPlugin()],
@@ -80,9 +78,13 @@ const meta: Meta<typeof Thread.Root> = {
     }),
     withTheme,
     withLayout({ fullscreen: true }),
-    withClientProvider({ createSpace: true, types: [ThreadType, DataType.Message] }),
+    withClientProvider({ createSpace: true, types: [ThreadType, ChannelType, DataType.Message] }),
   ],
   parameters: { translations },
-};
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

package/src/components/ChatContainer.tsx

@@ -5,7 +5,7 @@
 import React, { useLayoutEffect, useMemo, useRef, useState } from 'react';
 
 import { Obj, Ref } from '@dxos/echo';
-import { fullyQualifiedId, type Space, useMembers } from '@dxos/react-client/echo';
+import { type Space, fullyQualifiedId, useMembers } 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';
@@ -21,13 +21,14 @@ import {
 import { DataType } from '@dxos/schema';
 import { isNonNullable } from '@dxos/util';
 
-import { MessageContainer } from './MessageContainer';
-import { command } from './command-extension';
 import { useStatus } from '../hooks';
 import { meta } from '../meta';
 import { type ThreadType } from '../types';
 import { getMessageMetadata } from '../util';
 
+import { command } from './command-extension';
+import { MessageContainer } from './MessageContainer';
+
 export const ChatHeading = ({ attendableId }: { attendableId?: string }) => {
   const { t } = useTranslation(meta.id);
   return (
@@ -111,7 +112,10 @@ export const ChatContainer = ({ space, thread, context, current, autoFocusTextbo
     <Thread.Root
       current={current}
       id={id}
-      classNames='bs-full grid-rows-[1fr_min-content_min-content] overflow-hidden transition-[padding-block-end] [[data-sidebar-inline-start-state=open]_&]:lg:pbe-0'
+      classNames={[
+        'bs-full is-full max-is-prose mli-auto grid-rows-[1fr_min-content_min-content] overflow-hidden',
+        'transition-[padding-block-end] [[data-sidebar-inline-start-state=open]_&]:lg:pbe-0',
+      ]}
     >
       <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]'>

package/src/components/Comments.stories.tsx

@@ -4,8 +4,8 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react-vite';
-import React, { useEffect } from 'react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React from 'react';
 
 import { IntentPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
@@ -14,14 +14,16 @@ import { ClientPlugin } from '@dxos/plugin-client';
 import { faker } from '@dxos/random';
 import { useQuery, useSpace } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
+import { useAsyncEffect } from '@dxos/react-ui';
 import { AnchoredTo, DataType } from '@dxos/schema';
 import { layoutCentered, render, withLayout, withTheme } from '@dxos/storybook-utils';
 
-import { CommentsContainer } from './CommentsContainer';
-import { createCommentThread } from './testing';
 import { translations } from '../translations';
 import { ThreadType } from '../types';
 
+import { CommentsContainer } from './CommentsContainer';
+import { createCommentThread, createProposalThread } from './testing';
+
 faker.seed(1);
 
 const DefaultStory = () => {
@@ -29,27 +31,25 @@ const DefaultStory = () => {
   const space = useSpace();
   const anchors = useQuery(space, Query.type(AnchoredTo));
 
-  useEffect(() => {
+  useAsyncEffect(async () => {
     if (identity && space) {
-      const t = setTimeout(async () => {
-        const object = space.db.add(Obj.make(Type.Expando, {}));
-        const thread1 = space.db.add(createCommentThread(identity));
-        const thread2 = space.db.add(createCommentThread(identity));
-        space.db.add(
-          Relation.make(AnchoredTo, {
-            [Relation.Source]: thread1,
-            [Relation.Target]: object,
-          }),
-        );
-        space.db.add(
-          Relation.make(AnchoredTo, {
-            [Relation.Source]: thread2,
-            [Relation.Target]: object,
-          }),
-        );
-      });
-
-      return () => clearTimeout(t);
+      const object = space.db.add(Obj.make(Type.Expando, {}));
+      const thread1 = space.db.add(createCommentThread(identity));
+      const thread2 = space.db.add(createProposalThread(identity));
+      space.db.add(
+        Relation.make(AnchoredTo, {
+          [Relation.Source]: thread1,
+          [Relation.Target]: object,
+          anchor: 'test',
+        }),
+      );
+      space.db.add(
+        Relation.make(AnchoredTo, {
+          [Relation.Source]: thread2,
+          [Relation.Target]: object,
+          anchor: 'test',
+        }),
+      );
     }
   }, [identity, space]);
 
@@ -59,23 +59,25 @@ const DefaultStory = () => {
 
   return (
     <div className='w-[30rem] overflow-y-auto bg-baseSurface'>
-      <CommentsContainer anchors={anchors} onThreadDelete={console.log} />
+      <CommentsContainer anchors={anchors} onThreadDelete={console.log} onAcceptProposal={console.log} />
     </div>
   );
 };
 
-const meta: Meta = {
+const meta = {
   title: 'plugins/plugin-thread/Comments',
   render: render(DefaultStory),
   decorators: [
     withTheme,
     withLayout({ fullscreen: true, classNames: layoutCentered }),
+    // TODO(wittjosiah): This shouldn't depend on app framework. Should use withClientProvider instead.
+    //   Currently this is required due to useOnEditAnalytics.
     withPluginManager({
       plugins: [
         IntentPlugin(),
         ClientPlugin({
           types: [DataType.Message, ThreadType, AnchoredTo],
-          onClientInitialized: async (_, client) => {
+          onClientInitialized: async ({ client }) => {
             await client.halo.createIdentity();
           },
         }),
@@ -85,8 +87,10 @@ const meta: Meta = {
   parameters: {
     translations,
   },
-};
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
 
-export const Default = {};
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

package/src/components/CommentsContainer.tsx

@@ -9,10 +9,11 @@ import { fullyQualifiedId } from '@dxos/react-client/echo';
 import { Callout, Icon, Trans, useTranslation } from '@dxos/react-ui';
 import { type AnchoredTo } from '@dxos/schema';
 
-import { CommentsThreadContainer, type CommentsThreadContainerProps } from './CommentsThreadContainer';
 import { meta } from '../meta';
 import { type ThreadType } from '../types';
 
+import { CommentsThreadContainer, type CommentsThreadContainerProps } from './CommentsThreadContainer';
+
 export type CommentsContainerProps = Omit<CommentsThreadContainerProps, 'anchor' | 'current'> & {
   anchors: AnchoredTo[];
   currentId?: string;

package/src/components/CommentsThreadContainer.tsx

@@ -14,15 +14,13 @@ import { MessageTextbox, type MessageTextboxProps, Thread, type ThreadRootProps
 import { type AnchoredTo } from '@dxos/schema';
 import { isNonNullable } from '@dxos/util';
 
-import { MessageContainer } from './MessageContainer';
-import { command } from './command-extension';
 import { useStatus } from '../hooks';
 import { meta } from '../meta';
 import { type ThreadType } from '../types';
 import { getMessageMetadata } from '../util';
 
-// TODO(burdon): Remove need for p-1.
-export const commentControlClassNames = '!p-1 transition-opacity';
+import { command } from './command-extension';
+import { MessageContainer, buttonClassNames, buttonGroupClassNames } from './MessageContainer';
 
 export type CommentsThreadContainerProps = {
   anchor: AnchoredTo;
@@ -31,6 +29,7 @@ export type CommentsThreadContainerProps = {
   onResolve?: (anchor: AnchoredTo) => void;
   onMessageDelete?: (anchor: AnchoredTo, messageId: string) => void;
   onThreadDelete?: (anchor: AnchoredTo) => void;
+  onAcceptProposal?: (anchor: AnchoredTo, messageId: string) => void;
 } & Pick<ThreadRootProps, 'current'>;
 
 export const CommentsThreadContainer = ({
@@ -41,6 +40,7 @@ export const CommentsThreadContainer = ({
   onResolve,
   onMessageDelete,
   onThreadDelete,
+  onAcceptProposal,
 }: CommentsThreadContainerProps) => {
   const { t } = useTranslation(meta.id);
   const identity = useIdentity()!;
@@ -75,6 +75,7 @@ export const CommentsThreadContainer = ({
   const handleResolve = useCallback(() => onResolve?.(anchor), [onResolve, anchor]);
   const handleMessageDelete = useCallback((id: string) => onMessageDelete?.(anchor, id), [onMessageDelete, anchor]);
   const handleThreadDelete = useCallback(() => onThreadDelete?.(anchor), [onThreadDelete, anchor]);
+  const handleAcceptProposal = useCallback((id: string) => onAcceptProposal?.(anchor, id), [onAcceptProposal, anchor]);
 
   const handleComment: MessageTextboxProps['onSend'] = useCallback(() => {
     if (!messageRef.current) {
@@ -112,7 +113,7 @@ export const CommentsThreadContainer = ({
         ) : (
           <Thread.Header>{thread.name}</Thread.Header>
         )}
-        <div className='flex flex-row items-center gap-0.5'>
+        <div role='none' className={buttonGroupClassNames}>
           {thread.status === 'staged' && <Tag palette='neutral'>{t('draft button')}</Tag>}
           {onResolve && !(thread?.status === 'staged') && (
             <IconButton
@@ -121,7 +122,7 @@ export const CommentsThreadContainer = ({
               icon={thread?.status === 'resolved' ? 'ph--check--fill' : 'ph--check--regular'}
               iconOnly
               label={t('resolve thread label')}
-              classNames={[commentControlClassNames, thread?.status !== 'resolved' && hoverableControlItem]}
+              classNames={[buttonClassNames, thread?.status !== 'resolved' && hoverableControlItem]}
               onClick={handleResolve}
             />
           )}
@@ -132,7 +133,7 @@ export const CommentsThreadContainer = ({
               icon='ph--x--regular'
               iconOnly
               label={t('delete thread label')}
-              classNames={[commentControlClassNames, hoverableControlItem]}
+              classNames={[buttonClassNames, hoverableControlItem]}
               onClick={handleThreadDelete}
             />
           )}
@@ -147,6 +148,7 @@ export const CommentsThreadContainer = ({
           message={message}
           members={members}
           onDelete={handleMessageDelete}
+          onAcceptProposal={handleAcceptProposal}
         />
       ))}
 

package/src/components/Lobby/Lobby.tsx

@@ -5,7 +5,7 @@
 import React, { type FC, type PropsWithChildren, useEffect, useState } from 'react';
 
 import { useCapability } from '@dxos/app-framework';
-import { useTranslation, type ThemedClassName } from '@dxos/react-ui';
+import { type ThemedClassName, useTranslation } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 
 import { ThreadCapabilities } from '../../capabilities';