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

package/src/components/Call/Call.tsx

@@ -2,17 +2,19 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { type PropsWithChildren, type FC } from 'react';
+import { useAtomValue } from '@effect-atom/atom-react';
+import React, { type FC, type PropsWithChildren } from 'react';
 
-import { useCapability } from '@dxos/app-framework';
+import { useCapability } from '@dxos/app-framework/react';
 import { type ThemedClassName } from '@dxos/react-ui';
 
-import { Toolbar, type ToolbarProps } from './Toolbar';
-import { ThreadCapabilities } from '../../capabilities';
 import { useDebugMode } from '../../hooks';
+import { ThreadCapabilities } from '../../types';
 import { AudioStream } from '../Media';
 import { ParticipantGrid } from '../Participant';
 
+import { Toolbar, type ToolbarProps } from './Toolbar';
+
 //
 // Root
 //
@@ -33,8 +35,9 @@ type CallAudioProps = {};
 
 const CallAudio: FC<CallAudioProps> = () => {
   const call = useCapability(ThreadCapabilities.CallManager);
+  const audioTracksToPlay = useAtomValue(call.audioTracksToPlayAtom);
 
-  return <AudioStream tracks={call.audioTracksToPlay} />;
+  return <AudioStream tracks={audioTracksToPlay} />;
 };
 
 CallAudio.displayName = 'CallAudio';
@@ -50,10 +53,12 @@ type CallGridProps = {
 const CallGrid: FC<CallGridProps> = ({ fullscreen }) => {
   const debug = useDebugMode();
   const call = useCapability(ThreadCapabilities.CallManager);
+  const self = useAtomValue(call.selfAtom);
+  const users = useAtomValue(call.usersAtom);
 
   return (
     <div className='grid grow p-4 dark:bg-neutral-900'>
-      <ParticipantGrid self={call.self} users={call.users} debug={debug} fullscreen={fullscreen} />
+      <ParticipantGrid self={self} users={users} debug={debug} fullscreen={fullscreen} />
     </div>
   );
 };

package/src/components/Call/Toolbar.tsx

@@ -2,28 +2,30 @@
 // Copyright 2024 DXOS.org
 //
 
+import { useAtomValue } from '@effect-atom/atom-react';
 import React from 'react';
 
-import { useAppGraph, useCapability } from '@dxos/app-framework';
-import { useNode, useActions } from '@dxos/plugin-graph';
-import { fullyQualifiedId } from '@dxos/react-client/echo';
+import { useAppGraph, useCapability } from '@dxos/app-framework/react';
+import { Obj } from '@dxos/echo';
+import { Node, useActionRunner } from '@dxos/plugin-graph';
+import { useActions, useNode } from '@dxos/plugin-graph';
 import {
   Icon,
   IconButton,
   type IconButtonProps,
+  Toolbar as NaturalToolbar,
   type ThemedClassName,
-  Toolbar as NativeToolbar,
   toLocalizedString,
   useTranslation,
 } from '@dxos/react-ui';
-import { groupHoverControlItemWithTransition, mx } from '@dxos/react-ui-theme';
+import { groupHoverControlItemWithTransition, mx } from '@dxos/ui-theme';
 
-import { ThreadCapabilities } from '../../capabilities';
 import { meta } from '../../meta';
-import { type ChannelType } from '../../types';
+import { ThreadCapabilities } from '../../types';
+import { type Channel } from '../../types';
 
 export type ToolbarProps = ThemedClassName<{
-  channel?: ChannelType;
+  channel?: Channel.Channel;
   participants?: number;
   autoHideControls?: boolean;
   isInRoom?: boolean;
@@ -42,23 +44,27 @@ export const Toolbar = ({
 }: ToolbarProps) => {
   const { t } = useTranslation(meta.id);
   const { graph } = useAppGraph();
+  const runAction = useActionRunner();
   const call = useCapability(ThreadCapabilities.CallManager);
+  const media = useAtomValue(call.mediaAtom);
+  const joined = useAtomValue(call.joinedAtom);
+  const raisedHand = useAtomValue(call.raisedHandAtom);
 
   // Channel app graph node.
-  const node = useNode(graph, channel && fullyQualifiedId(channel));
+  const node = useNode(graph, channel && Obj.getDXN(channel).toString());
   const actions = useActions(graph, node?.id).filter((action) => action.properties.disposition === 'toolbar');
 
   // Screen sharing.
-  const isScreensharing = call.media.screenshareTrack !== undefined;
+  const isScreensharing = media.screenshareTrack !== undefined;
   const canSharescreen =
     typeof navigator.mediaDevices !== 'undefined' && navigator.mediaDevices.getDisplayMedia !== undefined;
 
   // TODO(wittjosiah): In order to use toolbar, need to update to actually use the graph action callbacks directly.
   return (
     <div className={mx('z-20 flex justify-center m-8', autoHideControls && groupHoverControlItemWithTransition)}>
-      <NativeToolbar.Root classNames={['p-2 bg-modalSurface rounded-md shadow-md', classNames]}>
+      <NaturalToolbar.Root classNames={['p-2 bg-modalSurface rounded-md shadow-md', classNames]}>
         <ToggleButton
-          active={call.media.audioEnabled}
+          active={media.audioEnabled}
           state={{
             on: {
               icon: 'ph--microphone--regular',
@@ -70,12 +76,12 @@ export const Toolbar = ({
               icon: 'ph--microphone-slash--duotone',
               label: t('mic on'),
               onClick: () => call.turnAudioOn(),
-              classNames: [call.joined && 'bg-callAlert'],
+              classNames: [joined && 'bg-callAlert'],
             },
           }}
         />
         <ToggleButton
-          active={call.media.videoEnabled}
+          active={media.videoEnabled}
           state={{
             on: {
               icon: 'ph--video-camera--regular',
@@ -95,9 +101,9 @@ export const Toolbar = ({
             <Icon icon='ph--users--regular' size={4} />
             <div>{participants}</div>
           </div>
-        )) || <NativeToolbar.Separator variant='gap' />}
+        )) || <NaturalToolbar.Separator variant='gap' />}
 
-        {call.joined && (
+        {joined && (
           <>
             <ToggleButton
               disabled={!canSharescreen}
@@ -117,25 +123,27 @@ export const Toolbar = ({
             />
 
             {/* Companion actions. */}
-            {actions.map((action) => (
-              <IconButton
-                key={action.id}
-                {...defaultButtonProps}
-                icon={action.properties.icon}
-                label={toLocalizedString(action.properties.label, t)}
-                classNames={action.properties.classNames}
-                onClick={() => action.data({ node })}
-              />
-            ))}
+            {actions
+              .filter((action): action is Node.Action => Node.isAction(action))
+              .map((action) => (
+                <IconButton
+                  key={action.id}
+                  {...defaultButtonProps}
+                  icon={action.properties.icon}
+                  label={toLocalizedString(action.properties.label, t)}
+                  classNames={action.properties.classNames}
+                  onClick={() => node && void runAction(action, { parent: node })}
+                />
+              ))}
 
             <ToggleButton
-              active={call.raisedHand}
+              active={raisedHand}
               state={{
                 on: {
                   icon: 'ph--hand-waving--regular',
                   label: t('lower hand'),
                   onClick: () => call.setRaisedHand(false),
-                  classNames: [call.joined && 'bg-callAlert'],
+                  classNames: [joined && 'bg-callAlert'],
                 },
                 off: {
                   icon: 'ph--hand-palm--duotone',
@@ -146,12 +154,12 @@ export const Toolbar = ({
             />
           </>
         )}
-        {call.joined ? (
+        {joined ? (
           <IconButton variant='destructive' icon='ph--phone-x--regular' label={t('leave call')} onClick={onLeave} />
         ) : (
           <IconButton variant='primary' icon='ph--phone-incoming--regular' label={t('join call')} onClick={onJoin} />
         )}
-      </NativeToolbar.Root>
+      </NaturalToolbar.Root>
     </div>
   );
 };

package/src/components/CallDebugPanel.tsx

@@ -2,28 +2,31 @@
 // 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<{
-  state?: GlobalState;
-}>;
+export type CallDebugPanelProps = ThemedClassName<{ state?: GlobalState }>;
 
 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 +37,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 +62,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'
@@ -64,52 +71,102 @@ export const CallDebugPanel = ({ state }: CallDebugPanelProps) => {
       open={open}
       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>}
+      maxHeight={0}
     >
-      <div className='flex flex-col gap-2 overflow-y-auto'>
-        <div className='flex items-row gap-2'>
+      <div className='flex flex-col is-full text-xs'>
+        <div className='flex items-center gap-2 items-center'>
           <Input.Root>
-            <Input.Label classNames={'text-sm'}>{t('show webrtc stats title')}</Input.Label>
-            <Input.Checkbox checked={showDetailedWebRTCStats} onCheckedChange={handleShowDetailedWebRTCStats} />
+            <Input.Switch checked={showDetailedWebRTCStats} onCheckedChange={handleShowDetailedWebRTCStats} />
+            <Input.Label>{t('show webrtc stats title')}</Input.Label>
           </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 items-center'>
+          <Input.Root>
+            <Input.Switch checked={showServiceHistory} onCheckedChange={handleToggleServiceHistory} />
+            <Input.Label>{t('show calls history title')}</Input.Label>
+          </Input.Root>
+        </div>
+        <div className='flex items-center gap-2 items-center'>
+          <IconButton 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='is-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

@@ -2,16 +2,19 @@
 // Copyright 2024 DXOS.org
 //
 
+import { useAtomValue } from '@effect-atom/atom-react';
 import React from 'react';
 
-import { useCapability } from '@dxos/app-framework';
+import { useCapability } from '@dxos/app-framework/react';
+
+import { ThreadCapabilities } from '../types';
 
 import { ChannelContainer } from './ChannelContainer';
-import { ThreadCapabilities } from '../capabilities';
 
 export const CallSidebar = () => {
   const call = useCapability(ThreadCapabilities.CallManager);
-  return <ChannelContainer roomId={call.roomId} />;
+  const roomId = useAtomValue(call.roomIdAtom);
+  return <ChannelContainer subject={undefined} roomId={roomId} />;
 };
 
 export default CallSidebar;

package/src/components/ChannelContainer.stories.tsx

@@ -2,57 +2,60 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { contributes } from '@dxos/app-framework';
+import { Capability, Common } from '@dxos/app-framework';
 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 { Query, useDatabase, useQuery } from '@dxos/react-client/echo';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+import { render } from '@dxos/storybook-utils';
+import { Message, Thread } from '@dxos/types';
 
-import { ChannelContainer, type ChannelContainerProps } from './ChannelContainer';
 import { createThreadPlugins } from '../testing';
 import { translations } from '../translations';
-import { ChannelType, ThreadType } from '../types';
+import { Channel } from '../types';
+
+import { ChannelContainer, type ChannelContainerProps } from './ChannelContainer';
 
 // TODO(wittjosiah): Channel doesn't render full height.
-const Story = ({ roomId }: ChannelContainerProps) => {
-  const space = useSpace();
-  const [channel] = useQuery(space, Query.type(ChannelType));
+const DefaultStory = ({ roomId }: ChannelContainerProps) => {
+  const db = useDatabase();
+  const [channel] = useQuery(db, Query.type(Channel.Channel));
   if (!channel) {
     return null;
   }
 
-  return <ChannelContainer channel={channel} roomId={roomId} />;
+  return <ChannelContainer subject={channel} roomId={roomId} />;
 };
 
-const meta: Meta<ChannelContainerProps> = {
+const meta = {
   title: 'plugins/plugin-thread/ChannelContainer',
   component: ChannelContainer,
-  render: (args) => <Story {...args} />,
+  render: render(DefaultStory),
   decorators: [
+    withTheme,
+    withLayout({ layout: 'column' }),
     withPluginManager({
       plugins: [...(await createThreadPlugins())],
-      capabilities: [contributes(ClientCapabilities.Schema, [ChannelType, ThreadType, DataType.Message])],
+      capabilities: [
+        Capability.contributes(Common.Capability.Schema, [Channel.Channel, Thread.Thread, Message.Message]),
+      ],
     }),
-    withLayout({ Container: ColumnContainer, classNames: 'w-[40rem] overflow-hidden' }),
   ],
   parameters: {
     translations,
   },
-};
+} satisfies Meta<typeof ChannelContainer>;
 
 export default meta;
 
-type Story = StoryObj<ChannelContainerProps>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {
     // Fixed room for testing.
+    subject: undefined,
     roomId: '04a1d1911703b8e929d0649021a965',
   },
 };

package/src/components/ChannelContainer.tsx

@@ -2,42 +2,49 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Rx } from '@effect-rx/rx-react';
-import React, { useCallback, useEffect, useMemo, useState, type ChangeEvent } from 'react';
+import { Atom, useAtomValue } from '@effect-atom/atom-react';
+import React, { type ChangeEvent, useCallback, useEffect, useMemo, useState } from 'react';
 
-import { useCapabilities, useCapability } from '@dxos/app-framework';
+import { type SurfaceComponentProps, useCapabilities, useCapability } from '@dxos/app-framework/react';
 import { Context } from '@dxos/context';
 import { failUndefined } from '@dxos/debug';
+import { Obj } from '@dxos/echo';
 import { log } from '@dxos/log';
 import { useClient } from '@dxos/react-client';
-import { fullyQualifiedId, getSpace } from '@dxos/react-client/echo';
+import { 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, 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 { meta } from '../meta';
+import { ThreadCapabilities } from '../types';
+import { type Channel } from '../types';
+
 import { Call } from './Call';
 import ChatContainer from './ChatContainer';
-import { ThreadCapabilities } from '../capabilities';
-import { meta } from '../meta';
-import { type ChannelType } from '../types';
 
-export type ChannelContainerProps = {
-  channel?: ChannelType;
-  roomId?: string;
-  role?: string;
-  fullscreen?: boolean;
-};
+export type ChannelContainerProps = SurfaceComponentProps<
+  Channel.Channel | undefined,
+  {
+    roomId?: string;
+    fullscreen?: boolean;
+  }
+>;
 
 /**
  * Renders a call when active, otherwise renders the channel chat.
  */
-export const ChannelContainer = ({ channel, roomId: _roomId, role, fullscreen }: ChannelContainerProps) => {
+// TODO(burdon): Create Radix style layout.
+export const ChannelContainer = ({ role, subject: channel, roomId: roomIdProp, fullscreen }: ChannelContainerProps) => {
   const space = getSpace(channel);
   const callManager = useCapability(ThreadCapabilities.CallManager);
-  const roomId = _roomId ?? (channel ? fullyQualifiedId(channel) : failUndefined());
+  const joined = useAtomValue(callManager.joinedAtom);
+  const currentRoomId = useAtomValue(callManager.roomIdAtom);
+  const attendableId = channel ? Obj.getDXN(channel).toString() : undefined;
+  const roomId = roomIdProp ?? attendableId ?? failUndefined();
   const identity = useIdentity();
   const isNamed = !!identity?.profile?.displayName;
   const joinSound = useSoundEffect('JoinCall');
@@ -78,7 +85,7 @@ export const ChannelContainer = ({ channel, roomId: _roomId, role, fullscreen }:
       return;
     }
 
-    if (callManager.joined) {
+    if (joined) {
       await callManager.leave();
     }
 
@@ -91,7 +98,7 @@ export const ChannelContainer = ({ channel, roomId: _roomId, role, fullscreen }:
       // TODO(burdon): Error sound.
       log.catch(err);
     }
-  }, [extensions, channel, roomId]);
+  }, [extensions, channel, roomId, joined]);
 
   /**
    * Leave the call.
@@ -110,10 +117,10 @@ export const ChannelContainer = ({ channel, roomId: _roomId, role, fullscreen }:
     }
   }, [extensions, roomId]);
 
-  const isJoined = callManager.joined && callManager.roomId === roomId;
+  const isJoined = joined && currentRoomId === roomId;
 
   return (
-    <StackItem.Content toolbar={!isJoined} classNames={isJoined && 'h-full'}>
+    <StackItem.Content classNames={isJoined && 'bs-full'} toolbar={!isJoined}>
       {isJoined && !isNamed && <DisplayNameMissing />}
       {isJoined && isNamed && (
         <Call.Root>
@@ -123,8 +130,8 @@ export const ChannelContainer = ({ channel, roomId: _roomId, role, fullscreen }:
       )}
       {!isJoined && channel && channel.defaultThread.target && space && (
         <>
-          <ChannelToolbar attendableId={fullyQualifiedId(channel)} role={role} onJoinCall={handleJoin} />
-          <ChatContainer space={space} thread={channel.defaultThread.target} />
+          <ChannelToolbar attendableId={attendableId} role={role} onJoinCall={handleJoin} />
+          <ChatContainer space={space} thread={channel.defaultThread.target} classNames='container-max-width' />
         </>
       )}
     </StackItem.Content>
@@ -160,7 +167,7 @@ const DisplayNameMissing = () => {
 const useChannelToolbarActions = (onJoinCall?: () => void) => {
   const creator = useMemo(
     () =>
-      Rx.make(() => {
+      Atom.make(() => {
         return {
           nodes: [
             createMenuItemGroup('root', {
@@ -181,19 +188,19 @@ const useChannelToolbarActions = (onJoinCall?: () => void) => {
   return useMenuActions(creator);
 };
 
-type ChannelToolbarProps = ThemedClassName<{
+type ChannelToolbarProps = {
   attendableId?: string;
   role?: string;
   onJoinCall?: () => void;
-}>;
+};
 
-const ChannelToolbar = ({ attendableId, role, onJoinCall, classNames }: ChannelToolbarProps) => {
+const ChannelToolbar = ({ attendableId, role, onJoinCall }: ChannelToolbarProps) => {
   const menuProps = useChannelToolbarActions(onJoinCall);
 
   return (
     <ElevationProvider elevation={role === 'section' ? 'positioned' : 'base'}>
       <MenuProvider {...menuProps} attendableId={attendableId}>
-        <ToolbarMenu classNames={classNames} />
+        <ToolbarMenu textBlockWidth />
       </MenuProvider>
     </ElevationProvider>
   );