@dxos/plugin-thread 0.8.4-main.5ea62a8 → 0.8.4-main.66e292d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-thread",
-  "version": "0.8.4-main.5ea62a8",
+  "version": "0.8.4-main.66e292d",
   "description": "DXOS Threads Surface plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -35,79 +35,83 @@
     "src"
   ],
   "dependencies": {
-    "@codemirror/language": "^6.10.3",
-    "@codemirror/state": "^6.4.1",
-    "@codemirror/view": "^6.34.1",
-    "@effect/ai": "0.25.2",
+    "@codemirror/language": "^6.11.3",
+    "@codemirror/state": "^6.5.2",
+    "@codemirror/view": "^6.38.4",
+    "@effect/ai": "0.29.1",
+    "@effect/experimental": "0.56.0",
     "@peermetrics/webrtc-stats": "5.7.1",
     "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
+    "@preact/signals-core": "^1.12.1",
     "date-fns": "^3.3.1",
     "extendable-media-recorder": "^9.2.19",
     "extendable-media-recorder-wav-encoder": "^7.0.123",
     "md5-hex": "5.0.0",
     "react-resize-detector": "^11.0.1",
     "wavefile": "^11.0.0",
-    "@dxos/app-framework": "0.8.4-main.5ea62a8",
-    "@dxos/assistant": "0.8.4-main.5ea62a8",
-    "@dxos/async": "0.8.4-main.5ea62a8",
-    "@dxos/debug": "0.8.4-main.5ea62a8",
-    "@dxos/devtools": "0.8.4-main.5ea62a8",
-    "@dxos/codec-protobuf": "0.8.4-main.5ea62a8",
-    "@dxos/display-name": "0.8.4-main.5ea62a8",
-    "@dxos/echo": "0.8.4-main.5ea62a8",
-    "@dxos/echo-schema": "0.8.4-main.5ea62a8",
-    "@dxos/invariant": "0.8.4-main.5ea62a8",
-    "@dxos/keys": "0.8.4-main.5ea62a8",
-    "@dxos/live-object": "0.8.4-main.5ea62a8",
-    "@dxos/context": "0.8.4-main.5ea62a8",
-    "@dxos/log": "0.8.4-main.5ea62a8",
-    "@dxos/local-storage": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-attention": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-deck": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-graph": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-markdown": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-observability": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-client": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-space": "0.8.4-main.5ea62a8",
-    "@dxos/protocols": "0.8.4-main.5ea62a8",
-    "@dxos/react-client": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-dnd": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-editor": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-form": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-attention": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-menu": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-stack": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-sfx": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-tabs": "0.8.4-main.5ea62a8",
-    "@dxos/schema": "0.8.4-main.5ea62a8",
-    "@dxos/util": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-thread": "0.8.4-main.5ea62a8"
+    "@dxos/app-framework": "0.8.4-main.66e292d",
+    "@dxos/assistant": "0.8.4-main.66e292d",
+    "@dxos/async": "0.8.4-main.66e292d",
+    "@dxos/blueprints": "0.8.4-main.66e292d",
+    "@dxos/codec-protobuf": "0.8.4-main.66e292d",
+    "@dxos/context": "0.8.4-main.66e292d",
+    "@dxos/debug": "0.8.4-main.66e292d",
+    "@dxos/devtools": "0.8.4-main.66e292d",
+    "@dxos/echo": "0.8.4-main.66e292d",
+    "@dxos/echo-db": "0.8.4-main.66e292d",
+    "@dxos/display-name": "0.8.4-main.66e292d",
+    "@dxos/functions": "0.8.4-main.66e292d",
+    "@dxos/invariant": "0.8.4-main.66e292d",
+    "@dxos/keys": "0.8.4-main.66e292d",
+    "@dxos/local-storage": "0.8.4-main.66e292d",
+    "@dxos/live-object": "0.8.4-main.66e292d",
+    "@dxos/log": "0.8.4-main.66e292d",
+    "@dxos/plugin-attention": "0.8.4-main.66e292d",
+    "@dxos/plugin-client": "0.8.4-main.66e292d",
+    "@dxos/plugin-deck": "0.8.4-main.66e292d",
+    "@dxos/plugin-graph": "0.8.4-main.66e292d",
+    "@dxos/plugin-markdown": "0.8.4-main.66e292d",
+    "@dxos/plugin-observability": "0.8.4-main.66e292d",
+    "@dxos/plugin-space": "0.8.4-main.66e292d",
+    "@dxos/protocols": "0.8.4-main.66e292d",
+    "@dxos/react-ui-attention": "0.8.4-main.66e292d",
+    "@dxos/react-ui-dnd": "0.8.4-main.66e292d",
+    "@dxos/react-ui-editor": "0.8.4-main.66e292d",
+    "@dxos/react-ui-form": "0.8.4-main.66e292d",
+    "@dxos/react-ui-menu": "0.8.4-main.66e292d",
+    "@dxos/react-ui-sfx": "0.8.4-main.66e292d",
+    "@dxos/react-ui-stack": "0.8.4-main.66e292d",
+    "@dxos/react-ui-tabs": "0.8.4-main.66e292d",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.66e292d",
+    "@dxos/react-ui-thread": "0.8.4-main.66e292d",
+    "@dxos/schema": "0.8.4-main.66e292d",
+    "@dxos/types": "0.8.4-main.66e292d",
+    "@dxos/util": "0.8.4-main.66e292d",
+    "@dxos/react-client": "0.8.4-main.66e292d"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.90.2",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "effect": "3.17.7",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "7.1.1",
-    "@dxos/plugin-theme": "0.8.4-main.5ea62a8",
-    "@dxos/random": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-theme": "0.8.4-main.5ea62a8",
-    "@dxos/storybook-utils": "0.8.4-main.5ea62a8"
+    "@effect-atom/atom-react": "^0.3.4",
+    "@effect/platform": "0.92.1",
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.2",
+    "effect": "3.18.3",
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/plugin-theme": "0.8.4-main.66e292d",
+    "@dxos/random": "0.8.4-main.66e292d",
+    "@dxos/react-ui": "0.8.4-main.66e292d",
+    "@dxos/react-ui-theme": "0.8.4-main.66e292d",
+    "@dxos/storybook-utils": "0.8.4-main.66e292d"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
+    "@effect-atom/atom-react": "^0.3.4",
     "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-theme": "0.8.4-main.5ea62a8"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.66e292d",
+    "@dxos/react-ui-theme": "0.8.4-main.66e292d"
   },
   "publishConfig": {
     "access": "public"

package/src/ThreadPlugin.tsx

@@ -3,160 +3,161 @@
 //
 
 import { Capabilities, Events, contributes, createIntent, defineModule, definePlugin } from '@dxos/app-framework';
-import { Ref } from '@dxos/echo';
+import { Ref, Type } from '@dxos/echo';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
 import { MarkdownEvents } from '@dxos/plugin-markdown';
 import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space';
-import { defineObjectForm } from '@dxos/plugin-space/types';
+import { type CreateObjectIntent } from '@dxos/plugin-space/types';
 import { translations as threadTranslations } from '@dxos/react-ui-thread';
-import { AnchoredTo, DataType } from '@dxos/schema';
+import { AnchoredTo, Message, Thread } from '@dxos/types';
 
 import {
   AppGraphBuilder,
+  BlueprintDefinition,
   CallManager,
   IntentResolver,
   Markdown,
   ReactRoot,
   ReactSurface,
+  Repair,
   ThreadState,
-  Toolkit,
 } from './capabilities';
 import { THREAD_ITEM, meta } from './meta';
 import { translations } from './translations';
-import { ChannelType, ThreadAction, ThreadType } from './types';
+import { Channel, ThreadAction } from './types';
 
 // TODO(Zan): Every instance of `cursor` should be replaced with `anchor`.
 //  NOTE(burdon): Review/discuss CursorConverter semantics.
 
 // TODO(wittjosiah): Rename to ChatPlugin.
 // TODO(wittjosiah): Enabling comments should likely be factored out of this plugin but depend on it's capabilities.
-export const ThreadPlugin = () =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/call-manager`,
-      activatesOn: ClientEvents.ClientReady,
-      activate: CallManager,
-    }),
-    // TODO(wittjosiah): Currently not used but leaving because there will likely be settings for threads again.
-    // defineModule({
-    //   id: `${meta.id}/module/settings`,
-    //   activatesOn: Events.SetupSettings,
-    //   activate: ThreadSettings,
-    // }),
-    defineModule({
-      id: `${meta.id}/module/state`,
-      // TODO(wittjosiah): Does not integrate with settings store.
-      //   Should this be a different event?
-      //   Should settings store be renamed to be more generic?
-      activatesOn: Events.SetupSettings,
-      activate: ThreadState,
-    }),
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, [...translations, ...threadTranslations]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/metadata`,
-      activatesOn: Events.SetupMetadata,
-      activate: () => [
-        contributes(Capabilities.Metadata, {
-          id: ChannelType.typename,
-          metadata: {
-            icon: 'ph--hash--regular',
+export const ThreadPlugin = definePlugin(meta, () => [
+  defineModule({
+    id: `${meta.id}/module/call-manager`,
+    activatesOn: ClientEvents.ClientReady,
+    activate: CallManager,
+  }),
+  // TODO(wittjosiah): Currently not used but leaving because there will likely be settings for threads again.
+  // defineModule({
+  //   id: `${meta.id}/module/settings`,
+  //   activatesOn: Events.SetupSettings,
+  //   activate: ThreadSettings,
+  // }),
+  defineModule({
+    id: `${meta.id}/module/state`,
+    // TODO(wittjosiah): Does not integrate with settings store.
+    //   Should this be a different event?
+    //   Should settings store be renamed to be more generic?
+    activatesOn: Events.SetupSettings,
+    activate: ThreadState,
+  }),
+  defineModule({
+    id: `${meta.id}/module/translations`,
+    activatesOn: Events.SetupTranslations,
+    activate: () => contributes(Capabilities.Translations, [...translations, ...threadTranslations]),
+  }),
+  defineModule({
+    id: `${meta.id}/module/metadata`,
+    activatesOn: Events.SetupMetadata,
+    activate: () => [
+      contributes(Capabilities.Metadata, {
+        id: Type.getTypename(Channel.Channel),
+        metadata: {
+          icon: 'ph--hash--regular',
+          iconHue: 'rose',
+          createObjectIntent: ((_, options) =>
+            createIntent(ThreadAction.CreateChannel, {
+              spaceId: options.space.id,
+            })) satisfies CreateObjectIntent,
+        },
+      }),
+      contributes(Capabilities.Metadata, {
+        id: Type.getTypename(Thread.Thread),
+        metadata: {
+          // TODO(wittjosiah): Move out of metadata.
+          loadReferences: async (thread: Thread.Thread) => await Ref.Array.loadAll(thread.messages ?? []),
+        },
+      }),
+      contributes(Capabilities.Metadata, {
+        id: Message.Message.typename,
+        metadata: {
+          // TODO(wittjosiah): Move out of metadata.
+          loadReferences: () => [], // loadObjectReferences(message, (message) => [...message.parts, message.context]),
+        },
+      }),
+      contributes(Capabilities.Metadata, {
+        id: THREAD_ITEM,
+        metadata: {
+          parse: (item: Thread.Thread, type: string) => {
+            switch (type) {
+              case 'node':
+                return { id: item.id, label: item.name, data: item };
+              case 'object':
+                return item;
+              case 'view-object':
+                return { id: `${item.id}-view`, object: item };
+            }
           },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: ThreadType.typename,
-          metadata: {
-            // TODO(wittjosiah): Move out of metadata.
-            loadReferences: async (thread: ThreadType) => await Ref.Array.loadAll(thread.messages ?? []),
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: DataType.Message.typename,
-          metadata: {
-            // TODO(wittjosiah): Move out of metadata.
-            loadReferences: (message: DataType.Message) => [], // loadObjectReferences(message, (message) => [...message.parts, message.context]),
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: THREAD_ITEM,
-          metadata: {
-            parse: (item: ThreadType, type: string) => {
-              switch (type) {
-                case 'node':
-                  return { id: item.id, label: item.name, data: item };
-                case 'object':
-                  return item;
-                case 'view-object':
-                  return { id: `${item.id}-view`, object: item };
-              }
-            },
-          },
-        }),
-      ],
-    }),
-    defineModule({
-      id: `${meta.id}/module/object-form`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () =>
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: ChannelType,
-            getIntent: (_, options) => createIntent(ThreadAction.CreateChannel, { spaceId: options.space.id }),
-          }),
-        ),
-    }),
-    defineModule({
-      id: `${meta.id}/module/schema`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () =>
-        contributes(ClientCapabilities.Schema, [AnchoredTo, ThreadType, DataType.Message, DataType.MessageV1]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/migration`,
-      activatesOn: ClientEvents.SetupMigration,
-      activate: () => contributes(ClientCapabilities.Migration, [DataType.MessageV1ToV2]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/on-space-created`,
-      activatesOn: SpaceEvents.SpaceCreated,
-      activate: () =>
-        contributes(SpaceCapabilities.OnSpaceCreated, ({ space, rootCollection }) =>
-          createIntent(ThreadAction.OnSpaceCreated, { space, rootCollection }),
-        ),
-    }),
-    defineModule({
-      id: `${meta.id}/module/markdown`,
-      activatesOn: MarkdownEvents.SetupExtensions,
-      activate: Markdown,
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-root`,
-      activatesOn: Events.Startup,
-      activate: ReactRoot,
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      activate: ReactSurface,
-    }),
-    defineModule({
-      id: `${meta.id}/module/intent-resolver`,
-      activatesOn: Events.SetupIntentResolver,
-      activate: IntentResolver,
-    }),
-    defineModule({
-      id: `${meta.id}/module/app-graph-builder`,
-      activatesOn: Events.SetupAppGraph,
-      activate: AppGraphBuilder,
-    }),
-    defineModule({
-      id: `${meta.id}/module/toolkit`,
-      // TODO(wittjosiah): Shouldn't use the startup event.
-      activatesOn: Events.Startup,
-      activate: Toolkit,
-    }),
-  ]);
+        },
+      }),
+    ],
+  }),
+  defineModule({
+    id: `${meta.id}/module/schema`,
+    activatesOn: ClientEvents.SetupSchema,
+    activate: () =>
+      contributes(ClientCapabilities.Schema, [
+        AnchoredTo.AnchoredTo,
+        Channel.Channel,
+        Message.Message,
+        Message.MessageV1,
+        Thread.Thread,
+      ]),
+  }),
+  defineModule({
+    id: `${meta.id}/module/migration`,
+    activatesOn: ClientEvents.SetupMigration,
+    activate: () => contributes(ClientCapabilities.Migration, [Message.MessageV1ToV2]),
+  }),
+  defineModule({
+    id: `${meta.id}/module/on-space-created`,
+    activatesOn: SpaceEvents.SpaceCreated,
+    activate: () =>
+      contributes(SpaceCapabilities.OnCreateSpace, (params) => createIntent(ThreadAction.OnCreateSpace, params)),
+  }),
+  defineModule({
+    id: `${meta.id}/module/repair`,
+    activatesOn: ClientEvents.SpacesReady,
+    activate: Repair,
+  }),
+  defineModule({
+    id: `${meta.id}/module/markdown`,
+    activatesOn: MarkdownEvents.SetupExtensions,
+    activate: Markdown,
+  }),
+  defineModule({
+    id: `${meta.id}/module/react-root`,
+    activatesOn: Events.Startup,
+    activate: ReactRoot,
+  }),
+  defineModule({
+    id: `${meta.id}/module/react-surface`,
+    activatesOn: Events.SetupReactSurface,
+    activate: ReactSurface,
+  }),
+  defineModule({
+    id: `${meta.id}/module/intent-resolver`,
+    activatesOn: Events.SetupIntentResolver,
+    activate: IntentResolver,
+  }),
+  defineModule({
+    id: `${meta.id}/module/app-graph-builder`,
+    activatesOn: Events.SetupAppGraph,
+    activate: AppGraphBuilder,
+  }),
+  defineModule({
+    id: `${meta.id}/module/blueprint`,
+    activatesOn: Events.SetupArtifactDefinition,
+    activate: BlueprintDefinition,
+  }),
+]);

package/src/calls/call-manager.ts

@@ -210,7 +210,7 @@ export class CallManager extends Resource {
 
   private _onCallStateUpdated(state: CallState): void {
     const tracksToPull = state.users
-      ?.filter((user) => user.joined && user.id !== state.self?.id)
+      ?.filter((user) => user.joined && user.id !== state.self!.id)
       ?.flatMap((user) => [user.tracks?.video, user.tracks?.audio, user.tracks?.screenshare])
       .filter(isNonNullable);
     this._mediaManager._schedulePullTracks(tracksToPull as EncodedTrackName[]);

package/src/calls/media-manager.ts

@@ -59,9 +59,13 @@ const USE_INAUDIBLE_AUDIO = true;
 
 export class MediaManager extends Resource {
   public readonly stateUpdated = new Event<MediaState>();
-  private readonly _state: MediaState = { pulledVideoStreams: {}, pulledAudioTracks: {} };
-  private _speakingMonitor?: SpeakingMonitor = undefined;
 
+  private readonly _state: MediaState = {
+    pulledVideoStreams: {},
+    pulledAudioTracks: {},
+  };
+
+  private _speakingMonitor?: SpeakingMonitor = undefined;
   private _trackToReconcile: EncodedTrackName[] = [];
   private _blackCanvasStreamTrack?: MediaStreamTrack = undefined;
   private _inaudibleAudioStreamTrack?: MediaStreamTrack = undefined;
@@ -85,6 +89,7 @@ export class MediaManager extends Resource {
       width: VIDEO_WIDTH,
       height: VIDEO_HEIGHT,
     });
+
     this._state.videoTrack = this._blackCanvasStreamTrack;
     this._state.videoStream = new MediaStream();
     this._state.videoStream.addTrack(this._state.videoTrack);
@@ -137,6 +142,7 @@ export class MediaManager extends Resource {
     this._state.videoStream!.removeTrack(this._state.videoTrack!);
     this._state.videoTrack = await getUserMediaTrack('videoinput', { width: VIDEO_WIDTH, height: VIDEO_HEIGHT });
     this._state.videoStream!.addTrack(this._state.videoTrack);
+
     this._state.videoEnabled = true;
     this.stateUpdated.emit(this._state);
     this._pushTracksTask!.schedule();
@@ -226,7 +232,6 @@ export class MediaManager extends Resource {
     // Wait for cloudflare to process the track.
     await cancelWithContext(this._ctx, sleep(800));
     const trackNames = this._trackToReconcile;
-
     const tracksToPull = trackNames.filter(
       (name) => !this._state.pulledAudioTracks[name] && !this._state.pulledVideoStreams[name],
     );
@@ -258,8 +263,8 @@ export class MediaManager extends Resource {
       currentAudioTracks: Object.keys(this._state.pulledAudioTracks),
       currentVideoStreams: Object.keys(this._state.pulledVideoStreams),
     });
-    this.stateUpdated.emit(this._state);
 
+    this.stateUpdated.emit(this._state);
     if (pullResults.some(({ shouldRetry }) => shouldRetry)) {
       await cancelWithContext(this._ctx, sleep(RETRY_INTERVAL));
       log.info('retrying pull tracks', { tracksToPull });
@@ -296,7 +301,6 @@ export class MediaManager extends Resource {
     }
 
     const shouldRetry = pushVideoResult.shouldRetry || pushAudioResult.shouldRetry || pushScreenshareResult.shouldRetry;
-
     if (updated) {
       this.stateUpdated.emit(this._state);
     }
@@ -313,7 +317,8 @@ export class MediaManager extends Resource {
     const ctx = this._ctx.derive();
     try {
       const trackData = TrackNameCodec.decode(name);
-      const track = await this._state.peer!.pullTrack({ trackData, ctx });
+      // We need to set mid here to `undefined`, because mid is peer specific.
+      const track = await this._state.peer!.pullTrack({ trackData: { ...trackData, mid: undefined }, ctx });
       if (track?.readyState === 'ended') {
         throw new Error('Pulled track ended immediately');
       }
@@ -355,7 +360,6 @@ export class MediaManager extends Resource {
     }
 
     const ctx = this._ctx.derive();
-
     try {
       return {
         track: await this._state.peer!.pushTrack({

package/src/calls/types.ts

@@ -2,6 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
+import { invariant } from '@dxos/invariant';
 import { buf } from '@dxos/protocols/buf';
 import {
   type ActivitySchema,
@@ -61,10 +62,13 @@ export type EncodedTrackName = string & { __brand: 'EncodedTrackName' };
 
 export const TrackNameCodec = {
   encode: (trackData: TrackObject): EncodedTrackName => {
-    return (trackData.sessionId + '/' + trackData.trackName) as EncodedTrackName;
+    invariant(trackData.sessionId);
+    invariant(trackData.trackName);
+    invariant(trackData.mid);
+    return (trackData.sessionId + '/' + trackData.trackName + '/' + trackData.mid) as EncodedTrackName;
   },
   decode: (name: EncodedTrackName): TrackObject => {
-    const [sessionId, trackName] = name.split('/');
-    return { sessionId, trackName, location: 'remote' };
+    const [sessionId, trackName, mid] = name.split('/');
+    return { sessionId, trackName, location: 'remote', mid };
   },
 };

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

@@ -33,12 +33,14 @@ export type CallsServiceConfig = {
 
 export type HistoryRecord =
   | {
+      endpoint: string;
       type: 'request';
       time: string;
       method: string;
       body: any;
     }
   | {
+      endpoint: string;
       type: 'response';
       time: string;
       status: number;
@@ -116,7 +118,7 @@ export class CallsServicePeer extends Resource {
     });
     peerConnection.addEventListener('connectionstatechange', () => {
       if (peerConnection.connectionState === 'failed' || peerConnection.connectionState === 'closed') {
-        log.warn('calls connection failed', { state: peerConnection.connectionState });
+        log.info('calls connection failed', { state: peerConnection.connectionState });
         void this._persistentLifecycle.scheduleRestart();
       }
     });
@@ -125,7 +127,7 @@ export class CallsServicePeer extends Resource {
     peerConnection.addEventListener('iceconnectionstatechange', () => {
       clearTimeout(iceTimeout);
       if (peerConnection.iceConnectionState === 'failed' || peerConnection.iceConnectionState === 'closed') {
-        log.warn('calls connection to ICEs failed', { state: peerConnection.iceConnectionState });
+        log.info('calls connection to ICEs failed', { state: peerConnection.iceConnectionState });
         void this._persistentLifecycle.scheduleRestart();
       } else if (peerConnection.iceConnectionState === 'disconnected') {
         // TODO(mykola): we should start to inspect the connection stats from here on for
@@ -138,7 +140,7 @@ export class CallsServicePeer extends Resource {
             return;
           }
 
-          log.warn('calls iceConnectionState timed out', { state: peerConnection.iceConnectionState, timeoutSeconds });
+          log.info('calls iceConnectionState timed out', { state: peerConnection.iceConnectionState, timeoutSeconds });
           void this._persistentLifecycle.scheduleRestart();
         }, timeoutSeconds * 1_000);
       }
@@ -155,6 +157,7 @@ export class CallsServicePeer extends Resource {
 
   private async _fetch<T extends ErrorResponse>(relativePath: string, requestInit?: RequestInit): Promise<T> {
     this.history.push({
+      endpoint: relativePath,
       type: 'request',
       time: new Date().toISOString(),
       method: requestInit?.method ?? 'GET',
@@ -170,6 +173,7 @@ export class CallsServicePeer extends Resource {
     try {
       const data = (await response.clone().json()) as T;
       this.history.push({
+        endpoint: relativePath,
         type: 'response',
         time: new Date().toISOString(),
         status: response.status,
@@ -183,6 +187,7 @@ export class CallsServicePeer extends Resource {
     } catch (error) {
       const text = await response.text();
       this.history.push({
+        endpoint: relativePath,
         type: 'response',
         time: new Date().toISOString(),
         status: response.status,
@@ -252,7 +257,7 @@ export class CallsServicePeer extends Resource {
           // we wait for the transceiver to start sending data before we emit
           // the track metadata to ensure that the track will be able to be
           // pulled before making the metadata available to anyone else.
-          await waitForTransceiverToSendData(ctx, transceiver);
+          // await waitForTransceiverToSendData(ctx, transceiver);
           return {
             ...trackData,
             sessionId,
@@ -406,7 +411,7 @@ export class CallsServicePeer extends Resource {
             })
             .catch((err) => log.catch(err));
         } else {
-          log.warn('missing track info', { trackData, availableTracks: Array.from(trackMap.keys()) });
+          log.info('missing track info', { trackData, availableTracks: Array.from(trackMap.keys()) });
         }
       });
 
@@ -533,8 +538,8 @@ const peerConnectionIsConnected = async (peerConnection: RTCPeerConnection) => {
 
 const INITIAL_DELAY = 50;
 const MAX_DELAY = 500;
-const MAX_RETRIES = 50;
-const WAIT_FOR_DATA_TIMEOUT = 20_000;
+const MAX_RETRIES = 20;
+const WAIT_FOR_DATA_TIMEOUT = 10_000;
 
 const waitForTransceiverToSendData = async (ctx: Context, transceiver: RTCRtpTransceiver): Promise<void> => {
   let delay = INITIAL_DELAY;