@dxos/plugin-thread 0.8.3-staging.0fa589b → 0.8.4-main.f9ba587

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-thread",
-  "version": "0.8.3-staging.0fa589b",
+  "version": "0.8.4-main.f9ba587",
   "description": "DXOS Threads Surface plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -45,66 +45,65 @@
     "md5-hex": "5.0.0",
     "react-resize-detector": "^12.0.2",
     "wavefile": "^11.0.0",
-    "@dxos/app-framework": "0.8.3-staging.0fa589b",
-    "@dxos/async": "0.8.3-staging.0fa589b",
-    "@dxos/codec-protobuf": "0.8.3-staging.0fa589b",
-    "@dxos/context": "0.8.3-staging.0fa589b",
-    "@dxos/display-name": "0.8.3-staging.0fa589b",
-    "@dxos/echo-schema": "0.8.3-staging.0fa589b",
-    "@dxos/invariant": "0.8.3-staging.0fa589b",
-    "@dxos/echo": "0.8.3-staging.0fa589b",
-    "@dxos/devtools": "0.8.3-staging.0fa589b",
-    "@dxos/live-object": "0.8.3-staging.0fa589b",
-    "@dxos/keys": "0.8.3-staging.0fa589b",
-    "@dxos/log": "0.8.3-staging.0fa589b",
-    "@dxos/local-storage": "0.8.3-staging.0fa589b",
-    "@dxos/plugin-client": "0.8.3-staging.0fa589b",
-    "@dxos/plugin-attention": "0.8.3-staging.0fa589b",
-    "@dxos/plugin-graph": "0.8.3-staging.0fa589b",
-    "@dxos/plugin-markdown": "0.8.3-staging.0fa589b",
-    "@dxos/plugin-deck": "0.8.3-staging.0fa589b",
-    "@dxos/plugin-observability": "0.8.3-staging.0fa589b",
-    "@dxos/plugin-space": "0.8.3-staging.0fa589b",
-    "@dxos/protocols": "0.8.3-staging.0fa589b",
-    "@dxos/react-client": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-dnd": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-attention": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-form": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-editor": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-menu": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-sfx": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-stack": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-tabs": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-thread": "0.8.3-staging.0fa589b",
-    "@dxos/schema": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-syntax-highlighter": "0.8.3-staging.0fa589b",
-    "@dxos/util": "0.8.3-staging.0fa589b"
+    "@dxos/app-framework": "0.8.4-main.f9ba587",
+    "@dxos/async": "0.8.4-main.f9ba587",
+    "@dxos/codec-protobuf": "0.8.4-main.f9ba587",
+    "@dxos/context": "0.8.4-main.f9ba587",
+    "@dxos/debug": "0.8.4-main.f9ba587",
+    "@dxos/devtools": "0.8.4-main.f9ba587",
+    "@dxos/display-name": "0.8.4-main.f9ba587",
+    "@dxos/echo": "0.8.4-main.f9ba587",
+    "@dxos/echo-schema": "0.8.4-main.f9ba587",
+    "@dxos/invariant": "0.8.4-main.f9ba587",
+    "@dxos/keys": "0.8.4-main.f9ba587",
+    "@dxos/live-object": "0.8.4-main.f9ba587",
+    "@dxos/local-storage": "0.8.4-main.f9ba587",
+    "@dxos/log": "0.8.4-main.f9ba587",
+    "@dxos/plugin-attention": "0.8.4-main.f9ba587",
+    "@dxos/plugin-client": "0.8.4-main.f9ba587",
+    "@dxos/plugin-deck": "0.8.4-main.f9ba587",
+    "@dxos/plugin-graph": "0.8.4-main.f9ba587",
+    "@dxos/plugin-markdown": "0.8.4-main.f9ba587",
+    "@dxos/plugin-observability": "0.8.4-main.f9ba587",
+    "@dxos/plugin-space": "0.8.4-main.f9ba587",
+    "@dxos/protocols": "0.8.4-main.f9ba587",
+    "@dxos/react-client": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-dnd": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-attention": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-form": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-editor": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-menu": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-sfx": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-stack": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-tabs": "0.8.4-main.f9ba587",
+    "@dxos/schema": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-thread": "0.8.4-main.f9ba587",
+    "@dxos/util": "0.8.4-main.f9ba587"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "0.80.12",
-    "@phosphor-icons/react": "^2.1.5",
+    "@effect-rx/rx-react": "0.38.0",
+    "@effect/platform": "0.88.0",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
-    "effect": "3.14.21",
+    "effect": "3.16.13",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/random": "0.8.3-staging.0fa589b",
-    "@dxos/plugin-theme": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui": "0.8.3-staging.0fa589b",
-    "@dxos/storybook-utils": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-theme": "0.8.3-staging.0fa589b"
+    "@dxos/plugin-theme": "0.8.4-main.f9ba587",
+    "@dxos/random": "0.8.4-main.f9ba587",
+    "@dxos/react-ui": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-theme": "0.8.4-main.f9ba587",
+    "@dxos/storybook-utils": "0.8.4-main.f9ba587"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "0.80.12",
-    "@phosphor-icons/react": "^2.1.5",
+    "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-theme": "0.8.3-staging.0fa589b"
+    "@dxos/react-ui": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-theme": "0.8.4-main.f9ba587"
   },
   "publishConfig": {
     "access": "public"

package/src/ThreadPlugin.tsx

@@ -23,7 +23,7 @@ import {
   ThreadState,
 } from './capabilities';
 import { meta, THREAD_ITEM } from './meta';
-import translations from './translations';
+import { translations } from './translations';
 import { ChannelType, ThreadAction, ThreadType } from './types';
 
 // TODO(Zan): Every instance of `cursor` should be replaced with `anchor`.

package/src/calls/call-manager.ts

@@ -88,8 +88,12 @@ export class CallManager extends Resource {
   }
 
   /** @reactive */
-  get pulledAudioTracks() {
-    return Object.values(this._state.media.pulledAudioTracks).map((track) => track.track);
+  get audioTracksToPlay(): MediaStreamTrack[] {
+    return (this._state.call.users ?? [])
+      .map((user) => (user.tracks?.audioEnabled ? user.tracks?.audio : undefined))
+      .filter(isNonNullable)
+      .map((track) => this._state.media.pulledAudioTracks[track as EncodedTrackName]?.track)
+      .filter(isNonNullable);
   }
 
   /** @reactive */

package/src/calls/media-manager.ts

@@ -54,6 +54,8 @@ export type MediaManagerParams = {
   serviceConfig: CallsServiceConfig;
 };
 
+const USE_INAUDIBLE_AUDIO = false;
+
 export class MediaManager extends Resource {
   public readonly stateUpdated = new Event<MediaState>();
   private readonly _state: MediaState = { pulledVideoStreams: {}, pulledAudioTracks: {} };
@@ -86,8 +88,10 @@ export class MediaManager extends Resource {
     this._state.videoStream = new MediaStream();
     this._state.videoStream.addTrack(this._state.videoTrack);
 
-    this._inaudibleAudioStreamTrack = await createInaudibleAudioStreamTrack({ ctx: this._ctx });
-    this._state.audioTrack = this._inaudibleAudioStreamTrack;
+    if (USE_INAUDIBLE_AUDIO) {
+      this._inaudibleAudioStreamTrack = await createInaudibleAudioStreamTrack({ ctx: this._ctx });
+      this._state.audioTrack = this._inaudibleAudioStreamTrack;
+    }
 
     this._pushTracksTask = new DeferredTask(this._ctx, async () => {
       await this._pushTracks();
@@ -170,11 +174,14 @@ export class MediaManager extends Resource {
   async turnAudioOff(): Promise<void> {
     void this._speakingMonitor?.close();
     this._speakingMonitor = undefined;
-    if (this._state.audioTrack !== this._inaudibleAudioStreamTrack) {
+    this._state.audioEnabled = false;
+    if (USE_INAUDIBLE_AUDIO && this._state.audioTrack !== this._inaudibleAudioStreamTrack) {
       this._state.audioTrack?.stop();
       this._state.audioTrack = this._inaudibleAudioStreamTrack;
+    } else {
+      this._state.audioTrack?.stop();
+      this._state.audioTrack = undefined;
     }
-    this._state.audioEnabled = false;
     this.stateUpdated.emit(this._state);
     this._pushTracksTask!.schedule();
   }

package/src/calls/util/calls-service.ts

@@ -73,7 +73,10 @@ export class CallsServicePeer extends Resource {
   pullTrackDispatcher = new BulkRequestDispatcher<
     TrackObject,
     {
-      trackMap: Map<TrackObject, { resolvedTrack: Promise<MediaStreamTrack>; mid: string }>;
+      /**
+       * trackName -> { resolvedTrack, mid }
+       */
+      trackMap: Map<string, { resolvedTrack: Promise<MediaStreamTrack>; mid: string }>;
     }
   >(32);
 
@@ -354,14 +357,14 @@ export class CallsServicePeer extends Resource {
             );
 
             if (pulledTrackData && pulledTrackData.mid) {
-              acc.set(track, {
+              acc.set(track.trackName!, {
                 mid: pulledTrackData.mid,
                 resolvedTrack: resolveTrack(peerConnection, (t) => t.mid === pulledTrackData.mid),
               });
             }
 
             return acc;
-          }, new Map<TrackObject, { resolvedTrack: Promise<MediaStreamTrack>; mid: string }>());
+          }, new Map<string, { resolvedTrack: Promise<MediaStreamTrack>; mid: string }>());
 
           if (newTrackResponse.requiresImmediateRenegotiation) {
             await peerConnection.setRemoteDescription(new RTCSessionDescription(newTrackResponse.sessionDescription));
@@ -392,7 +395,7 @@ export class CallsServicePeer extends Resource {
         }),
       )
       .then(({ trackMap }) => {
-        const trackInfo = trackMap.get(trackData);
+        const trackInfo = trackMap.get(trackData.trackName!);
         if (trackInfo) {
           return trackInfo.resolvedTrack
             .then((track) => {
@@ -401,7 +404,7 @@ export class CallsServicePeer extends Resource {
             })
             .catch((err) => log.catch(err));
         } else {
-          log.error('missing track info');
+          log.warn('missing track info', { trackData, availableTracks: Array.from(trackMap.keys()) });
         }
       });
 

package/src/calls/util/stub-media-streams.ts

@@ -48,19 +48,16 @@ export const createInaudibleAudioStreamTrack = async ({ ctx }: { ctx: Context })
   const audioContext = new window.AudioContext();
   const oscillator = audioContext.createOscillator();
   oscillator.type = 'triangle';
-
-  // set to 0.1 to make inaudible
-  oscillator.frequency.setValueAtTime(0.1, audioContext.currentTime);
+  // roughly sounds like a box fan
+  oscillator.frequency.setValueAtTime(20, audioContext.currentTime);
 
   const gainNode = audioContext.createGain();
   // even w/ gain at 0 some packets are sent
-  gainNode.gain.setValueAtTime(0, audioContext.currentTime);
-
+  gainNode.gain.setValueAtTime(0.02, audioContext.currentTime);
   oscillator.connect(gainNode);
 
   const destination = audioContext.createMediaStreamDestination();
   gainNode.connect(destination);
-
   oscillator.start();
 
   ctx.onDispose(async () => {

package/src/calls-service.stories.tsx

@@ -0,0 +1,216 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import '@dxos-theme';
+
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+
+import { scheduleTask, sleep } from '@dxos/async';
+import { Context } from '@dxos/context';
+import { invariant } from '@dxos/invariant';
+import { log } from '@dxos/log';
+import { Config, useConfig } from '@dxos/react-client';
+import { withClientProvider } from '@dxos/react-client/testing';
+import { Button } from '@dxos/react-ui';
+import { Json } from '@dxos/react-ui-syntax-highlighter';
+import { withLayout, withTheme } from '@dxos/storybook-utils';
+
+import { type TrackObject, CallsServicePeer, CALLS_URL } from './calls';
+import { useInaudibleAudioStreamTrack, useVideoStreamTrack } from './hooks';
+// @ts-ignore
+import video from '../testing/video.mp4';
+
+const pushAndPullTrack = (mediaStreamTrack?: MediaStreamTrack) => {
+  const config = useConfig();
+  const callsConfig = {
+    iceServers: config.get('runtime.services.ice'),
+    apiBase: `${CALLS_URL}/api/calls`,
+  };
+  const peerPush = useMemo(() => new CallsServicePeer(callsConfig), []);
+  const peerPull = useMemo(() => new CallsServicePeer(callsConfig), []);
+  const [metrics, setMetrics] = useState<Record<string, any>>({});
+  const trackInfo = useRef<TrackObject | undefined>(undefined);
+  const pullCtx = useRef<Context | undefined>(undefined);
+  const [pulledTrack, setPulledTrack] = useState<MediaStreamTrack | undefined>(undefined);
+  const hadRun = useRef(false);
+
+  // Push/pull video stream track to cloudflare.
+  useEffect(() => {
+    if (hadRun.current || !mediaStreamTrack || !peerPush || !peerPull) {
+      log.info('not running', { hadRun: hadRun.current, mediaStreamTrack, peerPush, peerPull });
+      return;
+    }
+    hadRun.current = true;
+    const ctx = Context.default();
+    ctx.onDispose(() => {
+      log.info('disposing ctx', { ctx });
+    });
+    scheduleTask(
+      ctx,
+      async () => {
+        log.info('starting push/pull', { mediaStreamTrack });
+        await peerPush.open();
+        await peerPull.open();
+        ctx.onDispose(() => {
+          void peerPush.close();
+          void peerPull.close();
+        });
+
+        // Push track to cloudflare.
+        performance.mark('push:begin');
+        log.info('pushing track', { track: mediaStreamTrack });
+        trackInfo.current = await peerPush.pushTrack({ track: mediaStreamTrack });
+        performance.mark('push:end');
+        const pushTime = performance.measure('push', 'push:begin', 'push:end').duration;
+        log.info('successfully pushed track', { pushTime, trackInfo: trackInfo.current });
+        setMetrics((prev) => ({ ...prev, 'time to push track [ms]': Math.round(pushTime) }));
+
+        // Wait for cloudflare to process the track.
+        await sleep(1000);
+
+        // Pull track from cloudflare.
+        performance.mark('pullTrack:begin');
+        pullCtx.current = Context.default();
+        let retries = 0;
+        let pulledTrack: MediaStreamTrack | undefined;
+        while (!pulledTrack && retries < 3) {
+          retries++;
+          log.info('pulling track', {
+            trackData: { ...trackInfo.current!, mid: undefined },
+            retries,
+            pulledTrack,
+          });
+          pulledTrack = await peerPull.pullTrack({
+            trackData: { ...trackInfo.current!, mid: undefined },
+            ctx: pullCtx.current,
+          });
+          await sleep(200);
+        }
+        invariant(pulledTrack);
+        setPulledTrack(pulledTrack);
+        performance.mark('pullTrack:end');
+        const pullTime = performance.measure('pullTrack', 'pullTrack:begin', 'pullTrack:end').duration;
+        setMetrics((prev) => ({ ...prev, 'time to pull track [ms]': Math.round(pullTime) }));
+        log.info('successfully pulled track', { pullTime, pulledTrack });
+      },
+      1000,
+    );
+
+    return () => {
+      void ctx.dispose();
+    };
+  }, [mediaStreamTrack, peerPush, peerPull]);
+
+  const rePullTrack = useCallback(async () => {
+    performance.mark('rePullVideo:begin');
+    invariant(pulledTrack);
+    pulledTrack.stop();
+    await pullCtx.current!.dispose();
+    pullCtx.current = Context.default();
+    const newPulledTrack = await peerPull.pullTrack({
+      trackData: { ...trackInfo.current!, mid: undefined },
+      ctx: pullCtx.current,
+    });
+    invariant(newPulledTrack);
+    setPulledTrack(newPulledTrack);
+    performance.mark('rePullVideo:end');
+    const rePullTime = performance.measure('rePullVideo', 'rePullVideo:begin', 'rePullVideo:end').duration;
+    setMetrics((prev) => ({ ...prev, 'time to re-pull video [ms]': Math.round(rePullTime) }));
+  }, [peerPull, trackInfo.current, pullCtx.current, pulledTrack]);
+
+  return {
+    pulledTrack,
+    rePullTrack,
+    metrics,
+  };
+};
+
+const meta = {
+  title: 'plugins/plugin-thread/calls-service',
+  decorators: [
+    withClientProvider({
+      config: new Config({
+        runtime: {
+          services: {
+            iceProviders: [{ urls: 'https://edge.dxos.workers.dev/ice' }],
+          },
+        },
+      }),
+    }),
+    withTheme,
+    withLayout(),
+  ],
+  parameters: {
+    layout: 'centered',
+  },
+};
+
+export default meta;
+
+export const Default = {
+  render: ({ videoSrc }: { videoSrc: string }) => {
+    const pushVideoElement = useRef<HTMLVideoElement>(null);
+    const pullVideoElement = useRef<HTMLVideoElement>(null);
+    // Get video stream track.
+    const videoStreamTrack = useVideoStreamTrack(pushVideoElement, videoSrc);
+    const { pulledTrack, rePullTrack, metrics } = pushAndPullTrack(videoStreamTrack);
+    const hadRun = useRef(false);
+
+    // Push/pull video stream track to cloudflare.
+    useEffect(() => {
+      if (!pulledTrack || hadRun.current) {
+        return;
+      }
+      hadRun.current = true;
+      const ctx = Context.default();
+      scheduleTask(ctx, async () => {
+        pullVideoElement.current!.srcObject = new MediaStream([pulledTrack]);
+        await pullVideoElement.current!.play();
+      });
+
+      return () => {
+        void ctx.dispose();
+      };
+    }, [pulledTrack]);
+
+    return (
+      <div className='grid grid-rows-3 gap-4 items-center'>
+        <video ref={pushVideoElement} muted autoPlay loop />
+        <div className='flex flex-col gap-4'>
+          <video ref={pullVideoElement} muted />
+          <Button
+            disabled={
+              !(
+                pullVideoElement?.current?.srcObject instanceof MediaStream &&
+                pullVideoElement.current.srcObject.getTracks()[0]
+              )
+            }
+            onClick={rePullTrack}
+          >
+            Re-pull video
+          </Button>
+        </div>
+        <Json data={metrics} />
+      </div>
+    );
+  },
+  args: {
+    videoSrc: video,
+  },
+};
+
+export const InaudibleAudioStreamTrack = {
+  render: () => {
+    const audioStreamTrack = useInaudibleAudioStreamTrack();
+
+    const { rePullTrack, metrics } = pushAndPullTrack(audioStreamTrack);
+
+    return (
+      <div className='flex flex-col gap-4 items-center'>
+        <Json data={metrics} />
+        <Button onClick={rePullTrack}>Re-pull audio</Button>
+      </div>
+    );
+  },
+};

package/src/components/Call/Call.tsx

@@ -34,7 +34,7 @@ type CallAudioProps = {};
 const CallAudio: FC<CallAudioProps> = () => {
   const call = useCapability(ThreadCapabilities.CallManager);
 
-  return <AudioStream tracks={call.pulledAudioTracks} />;
+  return <AudioStream tracks={call.audioTracksToPlay} />;
 };
 
 CallAudio.displayName = 'CallAudio';

package/src/components/Call/Toolbar.tsx

@@ -19,7 +19,7 @@ import {
 import { groupHoverControlItemWithTransition, mx } from '@dxos/react-ui-theme';
 
 import { ThreadCapabilities } from '../../capabilities';
-import { THREAD_PLUGIN } from '../../meta';
+import { meta } from '../../meta';
 import { type ChannelType } from '../../types';
 
 export type ToolbarProps = ThemedClassName<{
@@ -40,7 +40,7 @@ export const Toolbar = ({
   onJoin,
   onLeave,
 }: ToolbarProps) => {
-  const { t } = useTranslation(THREAD_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const { graph } = useAppGraph();
   const call = useCapability(ThreadCapabilities.CallManager);
 

package/src/components/CallDebugPanel.tsx

@@ -11,16 +11,16 @@ import { Input, useTranslation, type ThemedClassName } from '@dxos/react-ui';
 import { Json } from '@dxos/react-ui-syntax-highlighter';
 
 import { type GlobalState } from '../calls';
-import { THREAD_PLUGIN } from '../meta';
+import { meta } from '../meta';
 
 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 { t } = useTranslation(THREAD_PLUGIN);
 
   const [open, setOpen] = useState(false);
   const handleToggle = () => setOpen(!open);

package/src/components/ChannelContainer.stories.tsx

@@ -4,7 +4,7 @@
 
 import '@dxos-theme';
 
-import { type Meta, type StoryObj } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
 import { contributes } from '@dxos/app-framework';
@@ -16,24 +16,24 @@ import { withLayout, ColumnContainer } from '@dxos/storybook-utils';
 
 import { ChannelContainer, type ChannelContainerProps } from './ChannelContainer';
 import { createThreadPlugins } from '../testing';
-import translations from '../translations';
+import { translations } from '../translations';
 import { ChannelType, ThreadType } from '../types';
 
 // TODO(wittjosiah): Channel doesn't render full height.
-const Story = () => {
+const Story = ({ roomId }: ChannelContainerProps) => {
   const space = useSpace();
   const [channel] = useQuery(space, Query.type(ChannelType));
   if (!channel) {
     return null;
   }
 
-  return <ChannelContainer channel={channel} />;
+  return <ChannelContainer channel={channel} roomId={roomId} />;
 };
 
 const meta: Meta<ChannelContainerProps> = {
   title: 'plugins/plugin-thread/ChannelContainer',
   component: ChannelContainer,
-  render: () => <Story />,
+  render: (args) => <Story {...args} />,
   decorators: [
     withPluginManager({
       plugins: [...(await createThreadPlugins())],

package/src/components/ChannelContainer.tsx

@@ -7,6 +7,7 @@ import React, { useCallback, useEffect, useMemo, useState, type ChangeEvent } fr
 
 import { useCapabilities, useCapability } from '@dxos/app-framework';
 import { Context } from '@dxos/context';
+import { failUndefined } from '@dxos/debug';
 import { log } from '@dxos/log';
 import { useClient } from '@dxos/react-client';
 import { fullyQualifiedId, getSpace } from '@dxos/react-client/echo';
@@ -20,7 +21,7 @@ import { StackItem } from '@dxos/react-ui-stack';
 import { Call } from './Call';
 import ChatContainer from './ChatContainer';
 import { ThreadCapabilities } from '../capabilities';
-import { THREAD_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { type ChannelType } from '../types';
 
 export type ChannelContainerProps = {
@@ -36,7 +37,7 @@ export type ChannelContainerProps = {
 export const ChannelContainer = ({ channel, roomId: _roomId, role, fullscreen }: ChannelContainerProps) => {
   const space = getSpace(channel);
   const callManager = useCapability(ThreadCapabilities.CallManager);
-  const roomId = channel ? fullyQualifiedId(channel) : _roomId;
+  const roomId = _roomId ?? (channel ? fullyQualifiedId(channel) : failUndefined());
   const identity = useIdentity();
   const isNamed = !!identity?.profile?.displayName;
   const joinSound = useSoundEffect('JoinCall');
@@ -133,7 +134,7 @@ export const ChannelContainer = ({ channel, roomId: _roomId, role, fullscreen }:
 export default ChannelContainer;
 
 const DisplayNameMissing = () => {
-  const { t } = useTranslation(THREAD_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const client = useClient();
   const [displayName, setDisplayName] = useState('');
   const handleChange = useCallback((event: ChangeEvent<HTMLInputElement>) => setDisplayName(event.target.value), []);
@@ -163,10 +164,10 @@ const useChannelToolbarActions = (onJoinCall?: () => void) => {
         return {
           nodes: [
             createMenuItemGroup('root', {
-              label: ['channel toolbar title', { ns: THREAD_PLUGIN }],
+              label: ['channel toolbar title', { ns: meta.id }],
             }),
             createMenuAction('video-call', () => onJoinCall?.(), {
-              label: ['start video call label', { ns: THREAD_PLUGIN }],
+              label: ['start video call label', { ns: meta.id }],
               icon: 'ph--video-camera--regular',
               type: 'video-call',
             }),

package/src/components/Chat.stories.tsx

@@ -4,7 +4,7 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react';
+import { type Meta } from '@storybook/react-vite';
 import React, { useEffect, useState } from 'react';
 
 import { Capabilities, contributes, createSurface, IntentPlugin } from '@dxos/app-framework';
@@ -20,7 +20,7 @@ import { DataType } from '@dxos/schema';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { ChatContainer } from './ChatContainer';
-import translations from '../translations';
+import { translations } from '../translations';
 import { ChannelType, ThreadType } from '../types';
 
 faker.seed(1);
@@ -60,9 +60,9 @@ const Story = () => {
 
 export const Default = {};
 
-const meta: Meta = {
+const meta: Meta<typeof Thread.Root> = {
   title: 'plugins/plugin-thread/Chat',
-  component: Thread,
+  component: Thread.Root,
   render: () => <Story />,
   decorators: [
     withPluginManager({