@dxos/plugin-thread 0.8.4-main.7ace549 → 0.8.4-main.937b3ca

package/package.json

@@ -1,30 +1,43 @@
 {
   "name": "@dxos/plugin-thread",
-  "version": "0.8.4-main.7ace549",
+  "version": "0.8.4-main.937b3ca",
   "description": "DXOS Threads Surface plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
   "exports": {
     ".": {
-      "source": "./src/index.ts",
-      "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
+      "node": "./dist/lib/node-esm/index.mjs",
+      "source": "./src/index.ts",
+      "types": "./dist/types/src/index.d.ts"
+    },
+    "./blueprints": {
+      "browser": "./dist/lib/browser/blueprints/index.mjs",
+      "node": "./dist/lib/node-esm/blueprints/index.mjs",
+      "source": "./src/blueprints/index.ts",
+      "types": "./dist/types/src/blueprints/index.d.ts"
     },
     "./types": {
-      "source": "./src/types/index.ts",
-      "types": "./dist/types/src/types/index.d.ts",
       "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs"
+      "node": "./dist/lib/node-esm/types/index.mjs",
+      "source": "./src/types/index.ts",
+      "types": "./dist/types/src/types/index.d.ts"
     }
   },
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
     "*": {
+      "blueprints": [
+        "dist/types/src/blueprints/index.d.ts"
+      ],
       "types": [
         "dist/types/src/types/index.d.ts"
       ]
@@ -38,80 +51,84 @@
     "@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",
+    "@effect-atom/atom": "^0.4.13",
+    "@effect-atom/atom-react": "^0.4.6",
+    "@effect/ai": "0.32.1",
+    "@effect/experimental": "0.57.11",
     "@peermetrics/webrtc-stats": "5.7.1",
-    "@preact-signals/safe-react": "^0.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.7ace549",
-    "@dxos/assistant": "0.8.4-main.7ace549",
-    "@dxos/blueprints": "0.8.4-main.7ace549",
-    "@dxos/codec-protobuf": "0.8.4-main.7ace549",
-    "@dxos/async": "0.8.4-main.7ace549",
-    "@dxos/context": "0.8.4-main.7ace549",
-    "@dxos/devtools": "0.8.4-main.7ace549",
-    "@dxos/display-name": "0.8.4-main.7ace549",
-    "@dxos/debug": "0.8.4-main.7ace549",
-    "@dxos/echo-db": "0.8.4-main.7ace549",
-    "@dxos/echo": "0.8.4-main.7ace549",
-    "@dxos/functions": "0.8.4-main.7ace549",
-    "@dxos/invariant": "0.8.4-main.7ace549",
-    "@dxos/keys": "0.8.4-main.7ace549",
-    "@dxos/live-object": "0.8.4-main.7ace549",
-    "@dxos/local-storage": "0.8.4-main.7ace549",
-    "@dxos/log": "0.8.4-main.7ace549",
-    "@dxos/plugin-attention": "0.8.4-main.7ace549",
-    "@dxos/plugin-client": "0.8.4-main.7ace549",
-    "@dxos/plugin-deck": "0.8.4-main.7ace549",
-    "@dxos/plugin-graph": "0.8.4-main.7ace549",
-    "@dxos/plugin-markdown": "0.8.4-main.7ace549",
-    "@dxos/plugin-observability": "0.8.4-main.7ace549",
-    "@dxos/react-client": "0.8.4-main.7ace549",
-    "@dxos/protocols": "0.8.4-main.7ace549",
-    "@dxos/react-ui-attention": "0.8.4-main.7ace549",
-    "@dxos/react-ui-dnd": "0.8.4-main.7ace549",
-    "@dxos/react-ui-editor": "0.8.4-main.7ace549",
-    "@dxos/react-ui-menu": "0.8.4-main.7ace549",
-    "@dxos/react-ui-form": "0.8.4-main.7ace549",
-    "@dxos/react-ui-sfx": "0.8.4-main.7ace549",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.7ace549",
-    "@dxos/react-ui-tabs": "0.8.4-main.7ace549",
-    "@dxos/react-ui-stack": "0.8.4-main.7ace549",
-    "@dxos/react-ui-thread": "0.8.4-main.7ace549",
-    "@dxos/plugin-space": "0.8.4-main.7ace549",
-    "@dxos/types": "0.8.4-main.7ace549",
-    "@dxos/schema": "0.8.4-main.7ace549",
-    "@dxos/util": "0.8.4-main.7ace549"
+    "@dxos/app-framework": "0.8.4-main.937b3ca",
+    "@dxos/assistant": "0.8.4-main.937b3ca",
+    "@dxos/blueprints": "0.8.4-main.937b3ca",
+    "@dxos/async": "0.8.4-main.937b3ca",
+    "@dxos/codec-protobuf": "0.8.4-main.937b3ca",
+    "@dxos/context": "0.8.4-main.937b3ca",
+    "@dxos/devtools": "0.8.4-main.937b3ca",
+    "@dxos/debug": "0.8.4-main.937b3ca",
+    "@dxos/display-name": "0.8.4-main.937b3ca",
+    "@dxos/echo-react": "0.8.4-main.937b3ca",
+    "@dxos/echo": "0.8.4-main.937b3ca",
+    "@dxos/echo-db": "0.8.4-main.937b3ca",
+    "@dxos/effect": "0.8.4-main.937b3ca",
+    "@dxos/functions": "0.8.4-main.937b3ca",
+    "@dxos/invariant": "0.8.4-main.937b3ca",
+    "@dxos/keys": "0.8.4-main.937b3ca",
+    "@dxos/plugin-attention": "0.8.4-main.937b3ca",
+    "@dxos/operation": "0.8.4-main.937b3ca",
+    "@dxos/plugin-client": "0.8.4-main.937b3ca",
+    "@dxos/plugin-deck": "0.8.4-main.937b3ca",
+    "@dxos/plugin-graph": "0.8.4-main.937b3ca",
+    "@dxos/plugin-observability": "0.8.4-main.937b3ca",
+    "@dxos/plugin-markdown": "0.8.4-main.937b3ca",
+    "@dxos/protocols": "0.8.4-main.937b3ca",
+    "@dxos/plugin-space": "0.8.4-main.937b3ca",
+    "@dxos/react-client": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-attention": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-dnd": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-editor": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-menu": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-mosaic": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-sfx": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-stack": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-form": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-tabs": "0.8.4-main.937b3ca",
+    "@dxos/schema": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-thread": "0.8.4-main.937b3ca",
+    "@dxos/types": "0.8.4-main.937b3ca",
+    "@dxos/util": "0.8.4-main.937b3ca",
+    "@dxos/ui-editor": "0.8.4-main.937b3ca",
+    "@dxos/log": "0.8.4-main.937b3ca"
   },
   "devDependencies": {
-    "@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",
+    "@effect-atom/atom-react": "^0.4.6",
+    "@effect/platform": "0.93.6",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "effect": "3.19.11",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
     "vite": "7.1.9",
-    "@dxos/random": "0.8.4-main.7ace549",
-    "@dxos/react-ui-theme": "0.8.4-main.7ace549",
-    "@dxos/storybook-utils": "0.8.4-main.7ace549",
-    "@dxos/plugin-theme": "0.8.4-main.7ace549",
-    "@dxos/react-ui": "0.8.4-main.7ace549"
+    "@dxos/plugin-testing": "0.8.4-main.937b3ca",
+    "@dxos/plugin-theme": "0.8.4-main.937b3ca",
+    "@dxos/random": "0.8.4-main.937b3ca",
+    "@dxos/react-ui": "0.8.4-main.937b3ca",
+    "@dxos/ui-theme": "0.8.4-main.937b3ca",
+    "@dxos/storybook-utils": "0.8.4-main.937b3ca"
   },
   "peerDependencies": {
-    "@effect-atom/atom-react": "^0.3.4",
-    "@effect/platform": "^0.80.12",
-    "effect": "^3.13.3",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "@dxos/react-ui-theme": "0.8.4-main.7ace549",
-    "@dxos/react-ui": "0.8.4-main.7ace549"
+    "@effect-atom/atom-react": "^0.4.6",
+    "@effect/platform": "0.93.6",
+    "effect": "3.19.11",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/ui-theme": "0.8.4-main.937b3ca",
+    "@dxos/react-ui": "0.8.4-main.937b3ca"
   },
   "publishConfig": {
     "access": "public"

package/src/ThreadPlugin.tsx

@@ -2,12 +2,15 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Capabilities, Events, contributes, createIntent, defineModule, definePlugin } from '@dxos/app-framework';
+import * as Effect from 'effect/Effect';
+
+import { Capability, Common, Plugin } from '@dxos/app-framework';
 import { Ref, Type } from '@dxos/echo';
+import { Operation } from '@dxos/operation';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
 import { MarkdownEvents } from '@dxos/plugin-markdown';
 import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space';
-import { type CreateObjectIntent } from '@dxos/plugin-space/types';
+import { type CreateObject } from '@dxos/plugin-space/types';
 import { translations as threadTranslations } from '@dxos/react-ui-thread';
 import { AnchoredTo, Message, Thread } from '@dxos/types';
 
@@ -15,8 +18,8 @@ import {
   AppGraphBuilder,
   BlueprintDefinition,
   CallManager,
-  IntentResolver,
   Markdown,
+  OperationResolver,
   ReactRoot,
   ReactSurface,
   Repair,
@@ -24,68 +27,59 @@ import {
 } from './capabilities';
 import { THREAD_ITEM, meta } from './meta';
 import { translations } from './translations';
-import { Channel, ThreadAction } from './types';
+import { Channel, ThreadOperation } 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`,
+export const ThreadPlugin = Plugin.define(meta).pipe(
+  Plugin.addModule({
+    id: '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`,
+  // Plugin.addModule({
+  //   id: 'settings',
   //   activatesOn: Events.SetupSettings,
   //   activate: ThreadSettings,
   // }),
-  defineModule({
-    id: `${meta.id}/module/state`,
+  Plugin.addModule({
+    id: '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,
+    activatesOn: Common.ActivationEvent.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, {
+  Common.Plugin.addTranslationsModule({ translations: [...translations, ...threadTranslations] }),
+  Common.Plugin.addMetadataModule({
+    metadata: [
+      {
         id: Type.getTypename(Channel.Channel),
         metadata: {
           icon: 'ph--hash--regular',
           iconHue: 'rose',
-          createObjectIntent: ((_, options) =>
-            createIntent(ThreadAction.CreateChannel, {
-              spaceId: options.space.id,
-            })) satisfies CreateObjectIntent,
+          createObject: ((props) => Effect.sync(() => Channel.make(props))) satisfies CreateObject,
         },
-      }),
-      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) => {
@@ -99,65 +93,41 @@ export const ThreadPlugin = definePlugin(meta, () => [
             }
           },
         },
-      }),
+      },
     ],
   }),
-  defineModule({
-    id: `${meta.id}/module/schema`,
-    activatesOn: ClientEvents.SetupSchema,
-    activate: () =>
-      contributes(ClientCapabilities.Schema, [
-        AnchoredTo.AnchoredTo,
-        Channel.Channel,
-        Message.Message,
-        Message.MessageV1,
-        Thread.Thread,
-      ]),
+  Common.Plugin.addSchemaModule({
+    schema: [AnchoredTo.AnchoredTo, Channel.Channel, Message.Message, Message.MessageV1, Thread.Thread],
   }),
-  defineModule({
-    id: `${meta.id}/module/migration`,
+  Plugin.addModule({
+    id: 'migration',
     activatesOn: ClientEvents.SetupMigration,
-    activate: () => contributes(ClientCapabilities.Migration, [Message.MessageV1ToV2]),
+    activate: () => Effect.succeed(Capability.contributes(ClientCapabilities.Migration, [Message.MessageV1ToV2])),
   }),
-  defineModule({
-    id: `${meta.id}/module/on-space-created`,
+  Plugin.addModule({
+    id: 'on-space-created',
     activatesOn: SpaceEvents.SpaceCreated,
     activate: () =>
-      contributes(SpaceCapabilities.OnCreateSpace, (params) => createIntent(ThreadAction.OnCreateSpace, params)),
+      Effect.succeed(
+        Capability.contributes(SpaceCapabilities.OnCreateSpace, (params) =>
+          Operation.invoke(ThreadOperation.OnCreateSpace, params),
+        ),
+      ),
   }),
-  defineModule({
-    id: `${meta.id}/module/repair`,
+  Plugin.addModule({
+    id: 'repair',
     activatesOn: ClientEvents.SpacesReady,
     activate: Repair,
   }),
-  defineModule({
-    id: `${meta.id}/module/markdown`,
+  Plugin.addModule({
+    id: '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,
-  }),
-]);
+  Common.Plugin.addReactRootModule({ activate: ReactRoot }),
+  Common.Plugin.addSurfaceModule({ activate: ReactSurface }),
+  Common.Plugin.addOperationResolverModule({ activate: OperationResolver }),
+  Common.Plugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  Common.Plugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  Plugin.make,
+);

package/src/blueprints/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export * as ThreadBlueprint from './thread-blueprint';

package/src/blueprints/thread-blueprint.ts

@@ -0,0 +1,32 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Blueprint, Template } from '@dxos/blueprints';
+import { type FunctionDefinition } from '@dxos/functions';
+import { trim } from '@dxos/util';
+
+import { createProposals } from '../functions';
+
+export const functions: FunctionDefinition[] = [createProposals];
+
+export const Key = 'dxos.org/blueprint/thread';
+
+export const make = () =>
+  Blueprint.make({
+    key: Key,
+    name: 'Thread',
+    tools: Blueprint.toolDefinitions({ functions }),
+    instructions: Template.make({
+      // TODO(wittjosiah): Move example to function input schema annotation.
+      source: trim`
+        You can update markdown documents via proposals.
+        For each diff, respond with the smallest possible matching span.
+        For example:
+          - "There is a tyop in this sentence."
+          + "There is a typo in this sentence."
+          - "This id goof."
+          + "This is good."
+      `,
+    }),
+  });

package/src/calls/call-manager.ts

@@ -2,13 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import { computed } from '@preact/signals-core';
+import { Atom, type Registry } from '@effect-atom/atom-react';
 
 import { Event, synchronized } from '@dxos/async';
 import { type Client } from '@dxos/client';
 import { Resource } from '@dxos/context';
 import { invariant } from '@dxos/invariant';
-import { live } from '@dxos/live-object';
 import { type Tracks } from '@dxos/protocols/proto/dxos/edge/calls';
 import { isNonNullable } from '@dxos/util';
 
@@ -31,84 +30,103 @@ export class CallManager extends Resource {
   public readonly left = new Event<string>();
 
   /**
-   * Live object state. Is changed on internal events.
+   * Atom-based state. Updated via `_updateState()`.
    * CAUTION: Do not change directly.
    */
-  private readonly _state = live<GlobalState>({
+  private readonly _stateAtom = Atom.make<GlobalState>({
     call: {},
     media: { pulledAudioTracks: {}, pulledVideoStreams: {} },
   });
 
-  // TODO(wittjosiah): This shouldn't be necessary, live-object's signals should be granular.
-  private readonly _raisedHandSignal = computed(() => this._state.call.raisedHand ?? false);
-  private readonly _speakingSignal = computed(() => this._state.call.speaking ?? false);
-  private readonly _joinedSignal = computed(() => this._state.call.joined ?? false);
+  // Derived atoms for reactive subscriptions.
+  private readonly _roomIdAtom = Atom.make((get) => get(this._stateAtom).call.roomId);
+  private readonly _raisedHandAtom = Atom.make((get) => get(this._stateAtom).call.raisedHand ?? false);
+  private readonly _speakingAtom = Atom.make((get) => get(this._stateAtom).call.speaking ?? false);
+  private readonly _joinedAtom = Atom.make((get) => get(this._stateAtom).call.joined ?? false);
+  private readonly _selfAtom = Atom.make((get) => get(this._stateAtom).call.self ?? {});
+  private readonly _tracksAtom = Atom.make((get) => get(this._stateAtom).call.tracks ?? {});
+  private readonly _usersAtom = Atom.make((get) => get(this._stateAtom).call.users ?? []);
+  private readonly _mediaAtom = Atom.make((get) => get(this._stateAtom).media);
+  private readonly _audioTracksToPlayAtom = Atom.make((get) => {
+    const state = get(this._stateAtom);
+    return (state.call.users ?? [])
+      .map((user: UserState) => (user.tracks?.audioEnabled ? user.tracks?.audio : undefined))
+      .filter(isNonNullable)
+      .map((track: string) => state.media.pulledAudioTracks[track as EncodedTrackName]?.track)
+      .filter(isNonNullable);
+  });
+  private readonly _videoStreamAtomFamily = Atom.family<EncodedTrackName, Atom.Atom<MediaStream | undefined>>((name) =>
+    Atom.make((get) => get(this._stateAtom).media.pulledVideoStreams[name]?.stream),
+  );
+  private readonly _activityAtomFamily = Atom.family<string, Atom.Atom<ActivityState | undefined>>((key) =>
+    Atom.make((get) => get(this._stateAtom).call.activities?.[key]),
+  );
 
   private readonly _swarmSynchronizer: CallSwarmSynchronizer;
   private readonly _mediaManager: MediaManager;
 
-  /** @reactive */
-  get roomId(): string | undefined {
-    return this._state.call.roomId;
+  //
+  // Derived atoms for reactive UI subscriptions.
+  //
+
+  /** Derived atom for roomId. */
+  get roomIdAtom(): Atom.Atom<string | undefined> {
+    return this._roomIdAtom;
   }
 
-  /** @reactive */
-  get raisedHand(): boolean {
-    return this._raisedHandSignal.value;
+  /** Derived atom for raisedHand. */
+  get raisedHandAtom(): Atom.Atom<boolean> {
+    return this._raisedHandAtom;
   }
 
-  /** @reactive */
-  get speaking(): boolean {
-    return this._speakingSignal.value;
+  /** Derived atom for speaking. */
+  get speakingAtom(): Atom.Atom<boolean> {
+    return this._speakingAtom;
   }
 
-  /** @reactive */
-  get joined(): boolean {
-    return this._joinedSignal.value;
+  /** Derived atom for joined. */
+  get joinedAtom(): Atom.Atom<boolean> {
+    return this._joinedAtom;
   }
 
-  /** @reactive */
-  get self(): UserState {
-    return this._state.call.self ?? {};
+  /** Derived atom for self. */
+  get selfAtom(): Atom.Atom<UserState> {
+    return this._selfAtom;
   }
 
-  /** @reactive */
-  get tracks(): Tracks {
-    return this._state.call.tracks ?? {};
+  /** Derived atom for tracks. */
+  get tracksAtom(): Atom.Atom<Tracks> {
+    return this._tracksAtom;
   }
 
-  /** @reactive */
-  get users(): UserState[] {
-    return this._state.call.users ?? [];
+  /** Derived atom for users. */
+  get usersAtom(): Atom.Atom<UserState[]> {
+    return this._usersAtom;
   }
 
-  /** @reactive */
-  get media() {
-    return this._state.media;
+  /** Derived atom for media. */
+  get mediaAtom(): Atom.Atom<MediaState> {
+    return this._mediaAtom;
   }
 
-  /** @reactive */
-  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);
+  /** Derived atom for audioTracksToPlay. */
+  get audioTracksToPlayAtom(): Atom.Atom<MediaStreamTrack[]> {
+    return this._audioTracksToPlayAtom;
   }
 
-  /** @reactive */
-  get state() {
-    return this._state;
+  /** Returns the full state atom for reactive subscriptions. */
+  get stateAtom(): Atom.Atom<GlobalState> {
+    return this._stateAtom;
   }
 
-  /** @reactive */
-  getVideoStream(name?: EncodedTrackName): MediaStream | undefined {
-    return name ? this._state.media.pulledVideoStreams[name]?.stream : undefined;
+  /** Returns a derived atom for a video stream by name. */
+  videoStreamAtom(name: EncodedTrackName): Atom.Atom<MediaStream | undefined> {
+    return this._videoStreamAtomFamily(name);
   }
 
-  /** @reactive */
-  getActivity(key: string): ActivityState | undefined {
-    return this._state.call.activities?.[key];
+  /** Returns a derived atom for an activity by key. */
+  activityAtom(key: string): Atom.Atom<ActivityState | undefined> {
+    return this._activityAtomFamily(key);
   }
 
   setRoomId(roomId: string): void {
@@ -152,7 +170,10 @@ export class CallManager extends Resource {
   }
 
   // TODO(burdon): Can this be mocked?
-  constructor(private readonly _client: Client) {
+  constructor(
+    private readonly _client: Client,
+    private readonly _registry: Registry.Registry,
+  ) {
     super();
     this._client.config.getOrThrow('runtime.services.edge.url');
     const networkService = this._client.services.services.NetworkService;
@@ -205,7 +226,8 @@ export class CallManager extends Resource {
     this._swarmSynchronizer.setJoined(false);
     await this._swarmSynchronizer.leave();
     await this._mediaManager.leave();
-    this.roomId && this.left.emit(this.roomId);
+    const roomId = this._registry.get(this._roomIdAtom);
+    roomId && this.left.emit(roomId);
   }
 
   private _onCallStateUpdated(state: CallState): void {
@@ -240,7 +262,9 @@ export class CallManager extends Resource {
    * Only this method is allowed to change state.
    */
   private _updateState(): void {
-    this._state.call = this._swarmSynchronizer._getState();
-    this._state.media = this._mediaManager._getState();
+    this._registry.set(this._stateAtom, {
+      call: this._swarmSynchronizer._getState(),
+      media: this._mediaManager._getState(),
+    });
   }
 }