@dxos/plugin-thread 0.8.3-main.672df60 → 0.8.3-staging.0fa589b

package/dist/types/src/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAElC,OAAO,EAAE,UAAU,EAAY,MAAM,cAAc,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAGnD,yBAAiB,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;IAG5B,MAAM,OAAO,aAAc,SAAQ,kBAQjC;KAAG;;;;;;;;;;;;;;;;;;;;;IAEL,MAAM,OAAO,mBAAoB,SAAQ,wBAUxC;KAAG;;;;;;;;;;;IAEJ,MAAM,OAAO,MAAO,SAAQ,WAO1B;KAAG;;;;;;;;;;;;;;;;;;;;;;;;;IAEL,MAAM,OAAO,MAAO,SAAQ,WAO1B;KAAG;;;;;;;;;IAEL,MAAM,OAAO,MAAO,SAAQ,WAK1B;KAAG;;;;;;;;;;;;;;IAEL,MAAM,OAAO,cAAe,SAAQ,mBAKlC;KAAG;;;;;;;;;;;;;;;;;;;;;;;mCAOE,CAAC;;4BAKC,CAAC;8BAA4C,CAAC;6BAE3C,CAAC;+BAET,CAAJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAdA,MAAM,OAAO,UAAW,SAAQ,eAQ9B;KAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;uCAgCyjhB,CAAC;;gCAA8E,CAAC;kCAAgD,CAAC;iCAAkG,CAAC;mCAAiD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA9Bp1hB,MAAM,OAAO,aAAc,SAAQ,kBASjC;KAAG;;CACN;AAED,eAAO,MAAM,oBAAoB,mCAAoC,CAAC;AACtE,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAElF,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,UAAU,CAAC;CAClB;AAED,KAAK,SAAS,GAAG,MAAM,CAAC;AACxB,MAAM,MAAM,SAAS,GAAG;IAAE,mBAAmB,EAAE,OAAO,CAAA;CAAE,CAAC;AACzD,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AAErD,MAAM,MAAM,WAAW,GAAG;IACxB,4BAA4B;IAC5B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;IACrC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-thread",
-  "version": "0.8.3-main.672df60",
+  "version": "0.8.3-staging.0fa589b",
   "description": "DXOS Threads Surface plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -45,40 +45,40 @@
     "md5-hex": "5.0.0",
     "react-resize-detector": "^12.0.2",
     "wavefile": "^11.0.0",
-    "@dxos/app-framework": "0.8.3-main.672df60",
-    "@dxos/async": "0.8.3-main.672df60",
-    "@dxos/context": "0.8.3-main.672df60",
-    "@dxos/devtools": "0.8.3-main.672df60",
-    "@dxos/display-name": "0.8.3-main.672df60",
-    "@dxos/codec-protobuf": "0.8.3-main.672df60",
-    "@dxos/echo": "0.8.3-main.672df60",
-    "@dxos/echo-schema": "0.8.3-main.672df60",
-    "@dxos/keys": "0.8.3-main.672df60",
-    "@dxos/live-object": "0.8.3-main.672df60",
-    "@dxos/log": "0.8.3-main.672df60",
-    "@dxos/local-storage": "0.8.3-main.672df60",
-    "@dxos/invariant": "0.8.3-main.672df60",
-    "@dxos/plugin-attention": "0.8.3-main.672df60",
-    "@dxos/plugin-client": "0.8.3-main.672df60",
-    "@dxos/plugin-deck": "0.8.3-main.672df60",
-    "@dxos/plugin-graph": "0.8.3-main.672df60",
-    "@dxos/plugin-observability": "0.8.3-main.672df60",
-    "@dxos/plugin-markdown": "0.8.3-main.672df60",
-    "@dxos/plugin-space": "0.8.3-main.672df60",
-    "@dxos/protocols": "0.8.3-main.672df60",
-    "@dxos/react-client": "0.8.3-main.672df60",
-    "@dxos/react-ui-dnd": "0.8.3-main.672df60",
-    "@dxos/react-ui-editor": "0.8.3-main.672df60",
-    "@dxos/react-ui-attention": "0.8.3-main.672df60",
-    "@dxos/react-ui-menu": "0.8.3-main.672df60",
-    "@dxos/react-ui-stack": "0.8.3-main.672df60",
-    "@dxos/react-ui-form": "0.8.3-main.672df60",
-    "@dxos/react-ui-sfx": "0.8.3-main.672df60",
-    "@dxos/react-ui-syntax-highlighter": "0.8.3-main.672df60",
-    "@dxos/react-ui-tabs": "0.8.3-main.672df60",
-    "@dxos/react-ui-thread": "0.8.3-main.672df60",
-    "@dxos/schema": "0.8.3-main.672df60",
-    "@dxos/util": "0.8.3-main.672df60"
+    "@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"
   },
   "devDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -90,11 +90,11 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/plugin-theme": "0.8.3-main.672df60",
-    "@dxos/random": "0.8.3-main.672df60",
-    "@dxos/storybook-utils": "0.8.3-main.672df60",
-    "@dxos/react-ui": "0.8.3-main.672df60",
-    "@dxos/react-ui-theme": "0.8.3-main.672df60"
+    "@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"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -103,8 +103,8 @@
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.3-main.672df60",
-    "@dxos/react-ui-theme": "0.8.3-main.672df60"
+    "@dxos/react-ui": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-theme": "0.8.3-staging.0fa589b"
   },
   "publishConfig": {
     "access": "public"

package/src/ThreadPlugin.tsx

@@ -2,12 +2,14 @@
 // Copyright 2023 DXOS.org
 //
 
+import { Effect } from 'effect';
+
 import { Capabilities, contributes, createIntent, defineModule, definePlugin, Events } from '@dxos/app-framework';
+import { Ref, Type } from '@dxos/echo';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
 import { MarkdownEvents } from '@dxos/plugin-markdown';
-import { SpaceCapabilities } from '@dxos/plugin-space';
-import { defineObjectForm } from '@dxos/plugin-space/types';
-import { type AnyLiveObject, RefArray } from '@dxos/react-client/echo';
+import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space';
+import { CollectionAction, defineObjectForm } from '@dxos/plugin-space/types';
 import { translations as threadTranslations } from '@dxos/react-ui-thread';
 import { AnchoredTo, DataType } from '@dxos/schema';
 
@@ -69,7 +71,7 @@ export const ThreadPlugin = () =>
           id: ThreadType.typename,
           metadata: {
             // TODO(wittjosiah): Move out of metadata.
-            loadReferences: async (thread: ThreadType) => await RefArray.loadAll(thread.messages ?? []),
+            loadReferences: async (thread: ThreadType) => await Ref.Array.loadAll(thread.messages ?? []),
           },
         }),
         contributes(Capabilities.Metadata, {
@@ -82,10 +84,10 @@ export const ThreadPlugin = () =>
         contributes(Capabilities.Metadata, {
           id: THREAD_ITEM,
           metadata: {
-            parse: (item: AnyLiveObject<any>, type: string) => {
+            parse: (item: ThreadType, type: string) => {
               switch (type) {
                 case 'node':
-                  return { id: item.id, label: item.title, data: item };
+                  return { id: item.id, label: item.name, data: item };
                 case 'object':
                   return item;
                 case 'view-object':
@@ -119,6 +121,27 @@ export const ThreadPlugin = () =>
       activatesOn: ClientEvents.SetupMigration,
       activate: () => contributes(ClientCapabilities.Migration, [DataType.MessageV1ToV2]),
     }),
+    defineModule({
+      id: `${meta.id}/module/on-space-created`,
+      activatesOn: SpaceEvents.SpaceCreated,
+      activate: (context) => {
+        const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);
+        return contributes(SpaceCapabilities.OnSpaceCreated, async ({ space, rootCollection }) => {
+          const program = Effect.gen(function* () {
+            const { object: collection } = yield* dispatch(
+              createIntent(CollectionAction.CreateQueryCollection, { typename: Type.getTypename(ChannelType) }),
+            );
+            rootCollection.objects.push(Ref.make(collection));
+
+            const { object: channel } = yield* dispatch(
+              createIntent(ThreadAction.CreateChannel, { name: 'General', spaceId: space.id }),
+            );
+            space.db.add(channel);
+          });
+          await Effect.runPromise(program);
+        });
+      },
+    }),
     defineModule({
       id: `${meta.id}/module/markdown`,
       activatesOn: MarkdownEvents.SetupExtensions,

package/src/capabilities/app-graph-builder.ts

@@ -6,11 +6,11 @@ import { Rx } from '@effect-rx/rx-react';
 import { Option, pipe } from 'effect';
 
 import { Capabilities, contributes, createIntent, type PluginContext } from '@dxos/app-framework';
-import { getTypename, isInstanceOf } from '@dxos/echo-schema';
+import { Obj } from '@dxos/echo';
 import { AttentionCapabilities } from '@dxos/plugin-attention';
 import { PLANK_COMPANION_TYPE, ATTENDABLE_PATH_SEPARATOR, DECK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
 import { createExtension, ROOT_ID, rxFromSignal } from '@dxos/plugin-graph';
-import { fullyQualifiedId, isEchoObject } from '@dxos/react-client/echo';
+import { fullyQualifiedId } from '@dxos/react-client/echo';
 
 import { ThreadCapabilities } from './capabilities';
 import { meta, THREAD_PLUGIN } from '../meta';
@@ -63,7 +63,7 @@ export default (context: PluginContext) => {
         return Rx.make((get) => {
           return pipe(
             get(node),
-            Option.flatMap((node) => (isInstanceOf(ChannelType, node.data) ? Option.some(node.data) : Option.none())),
+            Option.flatMap((node) => (Obj.instanceOf(ChannelType, node.data) ? Option.some(node.data) : Option.none())),
             Option.map((channel) => {
               const callManager = context.getCapability(ThreadCapabilities.CallManager);
               const joined = get(
@@ -99,10 +99,10 @@ export default (context: PluginContext) => {
           pipe(
             get(node),
             Option.flatMap((node) => {
-              if (!isEchoObject(node.data) || isInstanceOf(ChannelType, node.data)) {
+              if (!Obj.isObject(node.data) || Obj.instanceOf(ChannelType, node.data)) {
                 return Option.none();
               }
-              const metadata = resolve(getTypename(node.data)!);
+              const metadata = resolve(Obj.getTypename(node.data)!);
               return typeof metadata.comments === 'string' ? Option.some(node) : Option.none();
             }),
             Option.map((node) => [
@@ -129,10 +129,10 @@ export default (context: PluginContext) => {
           pipe(
             get(node),
             Option.flatMap((node) => {
-              if (!isEchoObject(node.data) || isInstanceOf(ChannelType, node.data)) {
+              if (!Obj.isObject(node.data) || Obj.instanceOf(ChannelType, node.data)) {
                 return Option.none();
               }
-              const metadata = resolve(getTypename(node.data)!);
+              const metadata = resolve(Obj.getTypename(node.data)!);
               return typeof metadata.comments === 'string' ? Option.some(node.data) : Option.none();
             }),
             Option.map((object) => {
@@ -140,7 +140,7 @@ export default (context: PluginContext) => {
               const toolbar = get(context.capabilities(ThreadCapabilities.State))[0]?.state.toolbar ?? {};
               const disabled = get(
                 rxFromSignal(() => {
-                  const metadata = resolve(getTypename(object)!);
+                  const metadata = resolve(Obj.getTypename(object)!);
                   const selection = selectionManager.getSelection(fullyQualifiedId(object), metadata.selectionMode);
                   const anchor = getAnchor(selection);
                   const invalidSelection = !anchor;
@@ -154,7 +154,7 @@ export default (context: PluginContext) => {
                   id: `${fullyQualifiedId(object)}/comment`,
                   data: () => {
                     const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-                    const metadata = resolve(getTypename(object)!);
+                    const metadata = resolve(Obj.getTypename(object)!);
                     const selection = selectionManager.getSelection(fullyQualifiedId(object));
                     // TODO(wittjosiah): Use presence of selection to determine if the comment should be anchored.
                     // Requires all components which support selection (e.g. table/kanban) to support anchored comments.

package/src/capabilities/intent-resolver.ts

@@ -2,15 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
-import { batch } from '@preact/signals-core';
-
 import { Capabilities, contributes, createIntent, createResolver, type PluginContext } from '@dxos/app-framework';
-import { RelationSourceId, RelationTargetId } from '@dxos/echo-schema';
+import { sleep } from '@dxos/async';
+import { Obj, Relation } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 import { ATTENDABLE_PATH_SEPARATOR, DeckAction } from '@dxos/plugin-deck/types';
 import { ObservabilityAction } from '@dxos/plugin-observability/types';
 import { SpaceAction } from '@dxos/plugin-space/types';
-import { live, fullyQualifiedId, getSpace, Ref } from '@dxos/react-client/echo';
+import { fullyQualifiedId, getSpace, Ref } from '@dxos/react-client/echo';
 import { AnchoredTo, DataType } from '@dxos/schema';
 
 import { ThreadCapabilities } from './capabilities';
@@ -23,9 +22,9 @@ export default (context: PluginContext) =>
       intent: ThreadAction.CreateChannel,
       resolve: ({ name }) => ({
         data: {
-          object: live(ChannelType, {
+          object: Obj.make(ChannelType, {
             name,
-            defaultThread: Ref.make(live(ThreadType, { messages: [], status: 'active' })),
+            defaultThread: Ref.make(Obj.make(ThreadType, { messages: [], status: 'active' })),
             threads: [],
           }),
         },
@@ -34,7 +33,7 @@ export default (context: PluginContext) =>
     createResolver({
       intent: ThreadAction.CreateChannelThread,
       resolve: ({ channel }) => {
-        const thread = live(ThreadType, { messages: [], status: 'active' });
+        const thread = Obj.make(ThreadType, { messages: [], status: 'active' });
         channel.threads.push(Ref.make(thread));
         return {
           data: {
@@ -52,12 +51,13 @@ export default (context: PluginContext) =>
 
         const { state } = context.getCapability(ThreadCapabilities.MutableState);
         const subjectId = fullyQualifiedId(subject);
-        const thread = live(ThreadType, { name, messages: [], status: 'staged' });
-        const anchor = live(AnchoredTo, {
-          [RelationSourceId]: thread,
-          [RelationTargetId]: subject,
+        const thread = Obj.make(ThreadType, { name, messages: [], status: 'staged' });
+        const anchor = Relation.make(AnchoredTo, {
+          [Relation.Source]: thread,
+          [Relation.Target]: subject,
           anchor: _anchor,
         });
+
         const draft = state.drafts[subjectId];
         if (draft) {
           draft.push(anchor);
@@ -111,13 +111,13 @@ export default (context: PluginContext) =>
     }),
     createResolver({
       intent: ThreadAction.Delete,
-      resolve: ({ subject, anchor, thread: _thread }, undo) => {
-        const thread = _thread ?? (anchor[RelationSourceId] as ThreadType);
+      resolve: async ({ subject, anchor, thread: _thread }, undo) => {
+        const thread = _thread ?? (Relation.getSource(anchor) as ThreadType);
         const { state } = context.getCapability(ThreadCapabilities.MutableState);
         const subjectId = fullyQualifiedId(subject);
         const draft = state.drafts[subjectId];
         if (draft) {
-          // Check if we're deleting a draft; if so, remove it.
+          // Check if we're deleting a draft; if so, remo ve it.
           const index = draft.findIndex((a) => a.id === anchor.id);
           if (index !== -1) {
             draft.splice(index, 1);
@@ -131,10 +131,10 @@ export default (context: PluginContext) =>
         }
 
         if (!undo) {
-          batch(() => {
-            space.db.remove(thread);
-            space.db.remove(anchor);
-          });
+          // TODO(wittjosiah): Without sleep, rendering crashes at `Relation.setSource(anchor)`.
+          space.db.remove(anchor);
+          await sleep(100);
+          space.db.remove(thread);
 
           return {
             undoable: {
@@ -152,10 +152,10 @@ export default (context: PluginContext) =>
             ],
           };
         } else {
-          batch(() => {
-            space.db.add(thread);
-            space.db.add(anchor);
-          });
+          // TODO(wittjosiah): Without sleep, rendering crashes at `Relation.setSource(anchor)`.
+          space.db.add(thread);
+          await sleep(100);
+          space.db.add(anchor);
 
           return {
             intents: [
@@ -174,19 +174,19 @@ export default (context: PluginContext) =>
     createResolver({
       intent: ThreadAction.AddMessage,
       resolve: ({ anchor, subject, sender, text }) => {
-        const thread = anchor[RelationSourceId] as ThreadType;
+        const thread = Relation.getSource(anchor) as ThreadType;
         const { state } = context.getCapability(ThreadCapabilities.MutableState);
         const subjectId = fullyQualifiedId(subject);
         const space = getSpace(subject);
         invariant(space, 'Space not found');
         const intents = [];
 
-        const message = live(DataType.Message, {
+        const message = Obj.make(DataType.Message, {
           sender,
           created: new Date().toISOString(),
           blocks: [{ type: 'text', text }],
           // TODO(wittjosiah): Context based on attention.
-          // context: context ? makeRef(context) : undefined,
+          // context: context ? Ref.make(context) : undefined,
         });
         thread.messages.push(Ref.make(message));
 
@@ -236,7 +236,7 @@ export default (context: PluginContext) =>
     createResolver({
       intent: ThreadAction.DeleteMessage,
       resolve: ({ subject, anchor, messageId, message, messageIndex }, undo) => {
-        const thread = anchor[RelationSourceId] as ThreadType;
+        const thread = Relation.getSource(anchor) as ThreadType;
         const space = getSpace(subject);
         invariant(space, 'Space not found');
 

package/src/capabilities/react-surface.tsx

@@ -5,9 +5,9 @@
 import React from 'react';
 
 import { Capabilities, contributes, createSurface, useCapability } from '@dxos/app-framework';
-import { isInstanceOf, type Ref } from '@dxos/echo-schema';
+import { Obj, type Ref } from '@dxos/echo';
 import { SettingsStore } from '@dxos/local-storage';
-import { getSpace, isEchoObject } from '@dxos/react-client/echo';
+import { getSpace } from '@dxos/react-client/echo';
 
 import { ThreadCapabilities } from './capabilities';
 import {
@@ -26,14 +26,14 @@ export default () =>
     createSurface({
       id: `${THREAD_PLUGIN}/channel`,
       role: 'article',
-      filter: (data): data is { subject: ChannelType } => isInstanceOf(ChannelType, data.subject),
+      filter: (data): data is { subject: ChannelType } => Obj.instanceOf(ChannelType, data.subject),
       component: ({ data: { subject: channel }, role }) => <ChannelContainer channel={channel} role={role} />,
     }),
     createSurface({
       id: `${THREAD_PLUGIN}/chat-companion`,
       role: 'article',
       filter: (data): data is { companionTo: ChannelType; subject: 'chat' } =>
-        isInstanceOf(ChannelType, data.companionTo) && data.subject === 'chat',
+        Obj.instanceOf(ChannelType, data.companionTo) && data.subject === 'chat',
       component: ({ data: { companionTo: channel } }) => {
         const space = getSpace(channel);
         const thread = channel.defaultThread.target;
@@ -47,7 +47,7 @@ export default () =>
     createSurface({
       id: `${THREAD_PLUGIN}/thread`,
       role: 'article',
-      filter: (data): data is { subject: ThreadType } => isInstanceOf(ThreadType, data.subject),
+      filter: (data): data is { subject: ThreadType } => Obj.instanceOf(ThreadType, data.subject),
       component: ({ data: { subject: thread } }) => {
         const space = getSpace(thread);
         if (!space || !thread) {
@@ -60,8 +60,8 @@ export default () =>
     createSurface({
       id: `${THREAD_PLUGIN}/comments`,
       role: 'article',
-      filter: (data): data is { companionTo: { threads: Ref<ThreadType>[] } } =>
-        data.subject === 'comments' && isEchoObject(data.companionTo),
+      filter: (data): data is { companionTo: { threads: Ref.Ref<ThreadType>[] } } =>
+        data.subject === 'comments' && Obj.isObject(data.companionTo),
       // TODO(wittjosiah): This isn't scrolling properly in a plank.
       component: ({ data }) => <ThreadComplementary subject={data.companionTo} />,
     }),

package/src/capabilities/settings.ts

@@ -5,10 +5,15 @@
 import { Capabilities, contributes } from '@dxos/app-framework';
 import { live } from '@dxos/live-object';
 
-import { THREAD_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { type ThreadSettingsProps, ThreadSettingsSchema } from '../types';
 
 export default () => {
   const settings = live<ThreadSettingsProps>({});
-  return contributes(Capabilities.Settings, { schema: ThreadSettingsSchema, prefix: THREAD_PLUGIN, value: settings });
+
+  return contributes(Capabilities.Settings, {
+    prefix: meta.id,
+    schema: ThreadSettingsSchema,
+    value: settings,
+  });
 };

package/src/components/Call/Toolbar.tsx

@@ -16,7 +16,7 @@ import {
   toLocalizedString,
   useTranslation,
 } from '@dxos/react-ui';
-import { hoverableHidden, mx } from '@dxos/react-ui-theme';
+import { groupHoverControlItemWithTransition, mx } from '@dxos/react-ui-theme';
 
 import { ThreadCapabilities } from '../../capabilities';
 import { THREAD_PLUGIN } from '../../meta';
@@ -55,8 +55,8 @@ export const Toolbar = ({
 
   // 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 && hoverableHidden)}>
-      <NativeToolbar.Root classNames={['p-2 bg-modalSurface rounded-lg shadow-lg', classNames]}>
+    <div className={mx('z-20 flex justify-center m-8', autoHideControls && groupHoverControlItemWithTransition)}>
+      <NativeToolbar.Root classNames={['p-2 bg-modalSurface rounded-md shadow-md', classNames]}>
         <ToggleButton
           active={call.media.audioEnabled}
           state={{

package/src/components/ChannelContainer.tsx

@@ -11,7 +11,7 @@ import { log } from '@dxos/log';
 import { useClient } from '@dxos/react-client';
 import { fullyQualifiedId, getSpace } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
-import { useTranslation, Input, ElevationProvider } from '@dxos/react-ui';
+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 { useSoundEffect } from '@dxos/react-ui-sfx';
@@ -160,23 +160,19 @@ const useChannelToolbarActions = (onJoinCall?: () => void) => {
   const creator = useMemo(
     () =>
       Rx.make(() => {
-        const nodes = [];
-        const edges = [];
-
-        const rootGroup = createMenuItemGroup('root', {
-          label: ['channel toolbar title', { ns: THREAD_PLUGIN }],
-        });
-        nodes.push(rootGroup);
-
-        const sortAction = createMenuAction('video-call', () => onJoinCall?.(), {
-          label: ['start video call label', { ns: THREAD_PLUGIN }],
-          icon: 'ph--video-camera--regular',
-          type: 'video-call',
-        });
-        nodes.push(sortAction);
-        edges.push({ source: 'root', target: sortAction.id });
-
-        return { nodes, edges };
+        return {
+          nodes: [
+            createMenuItemGroup('root', {
+              label: ['channel toolbar title', { ns: THREAD_PLUGIN }],
+            }),
+            createMenuAction('video-call', () => onJoinCall?.(), {
+              label: ['start video call label', { ns: THREAD_PLUGIN }],
+              icon: 'ph--video-camera--regular',
+              type: 'video-call',
+            }),
+          ],
+          edges: [{ source: 'root', target: 'video-call' }],
+        };
       }),
     [],
   );
@@ -184,19 +180,19 @@ const useChannelToolbarActions = (onJoinCall?: () => void) => {
   return useMenuActions(creator);
 };
 
-type ChannelToolbarProps = {
+type ChannelToolbarProps = ThemedClassName<{
   attendableId?: string;
   role?: string;
   onJoinCall?: () => void;
-};
+}>;
 
-const ChannelToolbar = ({ attendableId, role, onJoinCall }: ChannelToolbarProps) => {
+const ChannelToolbar = ({ attendableId, role, onJoinCall, classNames }: ChannelToolbarProps) => {
   const menuProps = useChannelToolbarActions(onJoinCall);
 
   return (
     <ElevationProvider elevation={role === 'section' ? 'positioned' : 'base'}>
       <MenuProvider {...menuProps} attendableId={attendableId}>
-        <ToolbarMenu />
+        <ToolbarMenu classNames={classNames} />
       </MenuProvider>
     </ElevationProvider>
   );

package/src/components/Chat.stories.tsx

@@ -9,10 +9,10 @@ import React, { useEffect, useState } from 'react';
 
 import { Capabilities, contributes, createSurface, IntentPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { makeRef } from '@dxos/live-object';
+import { Obj, Ref } from '@dxos/echo';
 import { faker } from '@dxos/random';
 import { useClient } from '@dxos/react-client';
-import { live, type Space } from '@dxos/react-client/echo';
+import { type Space } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Thread } from '@dxos/react-ui-thread';
@@ -36,8 +36,8 @@ const Story = () => {
       setTimeout(async () => {
         const space = await client.spaces.create();
         const channel = space.db.add(
-          live(ChannelType, {
-            defaultThread: makeRef(live(ThreadType, { messages: [], status: 'active' })),
+          Obj.make(ChannelType, {
+            defaultThread: Ref.make(Obj.make(ThreadType, { messages: [], status: 'active' })),
             threads: [],
           }),
         );

package/src/components/ChatContainer.tsx

@@ -4,8 +4,8 @@
 
 import React, { useLayoutEffect, useMemo, useRef, useState } from 'react';
 
-import { live, makeRef } from '@dxos/live-object';
-import { type AnyLiveObject, fullyQualifiedId, type Space, useMembers } from '@dxos/react-client/echo';
+import { Obj, Ref } from '@dxos/echo';
+import { fullyQualifiedId, type Space, useMembers } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { Icon, ScrollArea, useThemeContext, useTranslation } from '@dxos/react-ui';
 import { createBasicExtensions, createThemeExtensions, listener } from '@dxos/react-ui-editor';
@@ -44,7 +44,7 @@ export const ChatHeading = ({ attendableId }: { attendableId?: string }) => {
 export type ChatContainerProps = {
   space: Space;
   thread: ThreadType;
-  context?: AnyLiveObject<any>;
+  context?: Obj.Any;
   autoFocusTextbox?: boolean;
 } & Pick<ThreadProps, 'current'>;
 
@@ -91,12 +91,12 @@ export const ChatContainer = ({ space, thread, context, current, autoFocusTextbo
     }
 
     thread.messages.push(
-      makeRef(
-        live(DataType.Message, {
+      Ref.make(
+        Obj.make(DataType.Message, {
           sender: { identityDid: identity.did },
           created: new Date().toISOString(),
           blocks: [{ type: 'text', text: messageRef.current }],
-          properties: context ? { context: makeRef(context) } : undefined,
+          properties: context ? { context: Ref.make(context) } : undefined,
         }),
       ),
     );

package/src/components/CommentContainer.tsx

@@ -5,7 +5,7 @@
 import { CheckCircle, X } from '@phosphor-icons/react';
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 
-import { RelationSourceId } from '@dxos/echo-schema';
+import { Relation } from '@dxos/echo';
 import { RefArray } from '@dxos/live-object';
 import { fullyQualifiedId, getSpace, useMembers } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
@@ -105,7 +105,7 @@ export const CommentContainer = ({
   const space = getSpace(anchor);
   const members = useMembers(space?.key);
   const detached = !anchor.anchor;
-  const thread = anchor[RelationSourceId] as ThreadType;
+  const thread = Relation.getSource(anchor) as ThreadType;
   const activity = useStatus(space, fullyQualifiedId(thread));
   const { t } = useTranslation(THREAD_PLUGIN);
   const threadScrollRef = useRef<HTMLDivElement | null>(null);