@dxos/plugin-thread 0.8.3-main.7f5a14c → 0.8.3

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.7f5a14c",
+  "version": "0.8.3",
   "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/async": "0.8.3-main.7f5a14c",
-    "@dxos/app-framework": "0.8.3-main.7f5a14c",
-    "@dxos/codec-protobuf": "0.8.3-main.7f5a14c",
-    "@dxos/devtools": "0.8.3-main.7f5a14c",
-    "@dxos/context": "0.8.3-main.7f5a14c",
-    "@dxos/display-name": "0.8.3-main.7f5a14c",
-    "@dxos/echo": "0.8.3-main.7f5a14c",
-    "@dxos/invariant": "0.8.3-main.7f5a14c",
-    "@dxos/echo-schema": "0.8.3-main.7f5a14c",
-    "@dxos/live-object": "0.8.3-main.7f5a14c",
-    "@dxos/keys": "0.8.3-main.7f5a14c",
-    "@dxos/log": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-attention": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-client": "0.8.3-main.7f5a14c",
-    "@dxos/local-storage": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-graph": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-deck": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-markdown": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-space": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-observability": "0.8.3-main.7f5a14c",
-    "@dxos/react-client": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-attention": "0.8.3-main.7f5a14c",
-    "@dxos/protocols": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-dnd": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-editor": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-form": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-menu": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-sfx": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-stack": "0.8.3-main.7f5a14c",
-    "@dxos/schema": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-thread": "0.8.3-main.7f5a14c",
-    "@dxos/util": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-syntax-highlighter": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-tabs": "0.8.3-main.7f5a14c"
+    "@dxos/app-framework": "0.8.3",
+    "@dxos/codec-protobuf": "0.8.3",
+    "@dxos/async": "0.8.3",
+    "@dxos/context": "0.8.3",
+    "@dxos/devtools": "0.8.3",
+    "@dxos/echo": "0.8.3",
+    "@dxos/echo-schema": "0.8.3",
+    "@dxos/keys": "0.8.3",
+    "@dxos/display-name": "0.8.3",
+    "@dxos/invariant": "0.8.3",
+    "@dxos/local-storage": "0.8.3",
+    "@dxos/live-object": "0.8.3",
+    "@dxos/log": "0.8.3",
+    "@dxos/plugin-attention": "0.8.3",
+    "@dxos/plugin-client": "0.8.3",
+    "@dxos/plugin-deck": "0.8.3",
+    "@dxos/plugin-graph": "0.8.3",
+    "@dxos/plugin-observability": "0.8.3",
+    "@dxos/plugin-space": "0.8.3",
+    "@dxos/plugin-markdown": "0.8.3",
+    "@dxos/protocols": "0.8.3",
+    "@dxos/react-client": "0.8.3",
+    "@dxos/react-ui-attention": "0.8.3",
+    "@dxos/react-ui-editor": "0.8.3",
+    "@dxos/react-ui-form": "0.8.3",
+    "@dxos/react-ui-dnd": "0.8.3",
+    "@dxos/react-ui-menu": "0.8.3",
+    "@dxos/react-ui-syntax-highlighter": "0.8.3",
+    "@dxos/react-ui-sfx": "0.8.3",
+    "@dxos/react-ui-stack": "0.8.3",
+    "@dxos/react-ui-tabs": "0.8.3",
+    "@dxos/schema": "0.8.3",
+    "@dxos/util": "0.8.3",
+    "@dxos/react-ui-thread": "0.8.3"
   },
   "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/random": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-theme": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-theme": "0.8.3-main.7f5a14c",
-    "@dxos/storybook-utils": "0.8.3-main.7f5a14c"
+    "@dxos/random": "0.8.3",
+    "@dxos/plugin-theme": "0.8.3",
+    "@dxos/react-ui": "0.8.3",
+    "@dxos/storybook-utils": "0.8.3",
+    "@dxos/react-ui-theme": "0.8.3"
   },
   "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.7f5a14c",
-    "@dxos/react-ui-theme": "0.8.3-main.7f5a14c"
+    "@dxos/react-ui": "0.8.3",
+    "@dxos/react-ui-theme": "0.8.3"
   },
   "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 } from '@dxos/echo';
+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 { 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';
 
@@ -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/intent-resolver.ts

@@ -2,11 +2,9 @@
 // Copyright 2025 DXOS.org
 //
 
-import { batch } from '@preact/signals-core';
-
 import { Capabilities, contributes, createIntent, createResolver, type PluginContext } from '@dxos/app-framework';
+import { sleep } from '@dxos/async';
 import { Obj, Relation } from '@dxos/echo';
-import { RelationSourceId, RelationTargetId } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { ATTENDABLE_PATH_SEPARATOR, DeckAction } from '@dxos/plugin-deck/types';
 import { ObservabilityAction } from '@dxos/plugin-observability/types';
@@ -55,10 +53,11 @@ export default (context: PluginContext) =>
         const subjectId = fullyQualifiedId(subject);
         const thread = Obj.make(ThreadType, { name, messages: [], status: 'staged' });
         const anchor = Relation.make(AnchoredTo, {
-          [RelationSourceId]: thread,
-          [RelationTargetId]: subject,
+          [Relation.Source]: thread,
+          [Relation.Target]: subject,
           anchor: _anchor,
         });
+
         const draft = state.drafts[subjectId];
         if (draft) {
           draft.push(anchor);
@@ -112,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);
@@ -132,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: {
@@ -153,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: [
@@ -175,7 +174,7 @@ 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);
@@ -237,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/components/Call/Toolbar.tsx

@@ -56,7 +56,7 @@ 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 && groupHoverControlItemWithTransition)}>
-      <NativeToolbar.Root classNames={['p-2 bg-modalSurface rounded-lg shadow-lg', classNames]}>
+      <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/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);

package/src/components/Comments.stories.tsx

@@ -10,7 +10,6 @@ import React, { useEffect } from 'react';
 import { IntentPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Obj, Query, Relation, Type } from '@dxos/echo';
-import { RelationSourceId, RelationTargetId } from '@dxos/echo-schema';
 import { faker } from '@dxos/random';
 import { useQuery, useSpace } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
@@ -36,8 +35,18 @@ const Story = ({ spaceKey }: ClientRepeatedComponentProps) => {
         const object = space.db.add(Obj.make(Type.Expando, {}));
         const thread1 = space.db.add(createCommentThread(identity));
         const thread2 = space.db.add(createCommentThread(identity));
-        space.db.add(Relation.make(AnchoredTo, { [RelationSourceId]: thread1, [RelationTargetId]: object }));
-        space.db.add(Relation.make(AnchoredTo, { [RelationSourceId]: thread2, [RelationTargetId]: object }));
+        space.db.add(
+          Relation.make(AnchoredTo, {
+            [Relation.Source]: thread1,
+            [Relation.Target]: object,
+          }),
+        );
+        space.db.add(
+          Relation.make(AnchoredTo, {
+            [Relation.Source]: thread2,
+            [Relation.Target]: object,
+          }),
+        );
       });
 
       return () => clearTimeout(t);

package/src/components/CommentsContainer.tsx

@@ -2,13 +2,11 @@
 // Copyright 2024 DXOS.org
 //
 
-import { ChatText } from '@phosphor-icons/react';
 import React, { useEffect } from 'react';
 
-import { RelationSourceId } from '@dxos/echo-schema';
+import { Relation } from '@dxos/echo';
 import { fullyQualifiedId } from '@dxos/react-client/echo';
-import { useTranslation, Trans } from '@dxos/react-ui';
-import { descriptionMessage, mx } from '@dxos/react-ui-theme';
+import { Callout, Icon, Trans, useTranslation } from '@dxos/react-ui';
 import { type AnchoredTo } from '@dxos/schema';
 
 import { CommentContainer, type CommentContainerProps } from './CommentContainer';
@@ -28,9 +26,9 @@ export const CommentsContainer = ({ anchors, currentId, showResolvedThreads, ...
   const { t } = useTranslation(THREAD_PLUGIN);
   // TODO(wittjosiah): There seems to be a race between thread and anchor being deleted.
   const filteredAnchors = showResolvedThreads
-    ? anchors.filter((anchor) => !!anchor[RelationSourceId])
+    ? anchors.filter((anchor) => !!Relation.getSource(anchor))
     : anchors.filter((anchor) => {
-        const thread = anchor[RelationSourceId];
+        const thread = Relation.getSource(anchor);
         return thread && thread.status !== 'resolved';
       });
 
@@ -40,30 +38,29 @@ export const CommentsContainer = ({ anchors, currentId, showResolvedThreads, ...
     }
   }, [currentId]);
 
-  return (
-    <>
-      {filteredAnchors.length > 0 ? (
-        filteredAnchors.map((anchor) => {
-          const thread = anchor[RelationSourceId] as ThreadType;
-          const threadId = fullyQualifiedId(thread);
-          return <CommentContainer key={threadId} anchor={anchor} current={currentId === threadId} {...props} />;
-        })
-      ) : (
-        <div role='alert' className={mx(descriptionMessage, 'place-self-center rounded-lg text-center m-4')}>
-          <h2 className='mbe-2 font-medium text-baseText'>{t('no comments title')}</h2>
-          <p>
+  if (filteredAnchors.length === 0) {
+    return (
+      <div role='none' className='plb-cardSpacingBlock pli-cardSpacingInline'>
+        <Callout.Root>
+          <Callout.Title>
             <Trans
               {...{
                 t,
                 i18nKey: 'no comments message',
                 components: {
-                  commentIcon: <ChatText className='inline-block' />,
+                  commentIcon: <Icon icon='ph--chat-text--regular' size={4} classNames='inline-block' />,
                 },
               }}
             />
-          </p>
-        </div>
-      )}
-    </>
-  );
+          </Callout.Title>
+        </Callout.Root>
+      </div>
+    );
+  }
+
+  return filteredAnchors.map((anchor) => {
+    const thread = Relation.getSource(anchor) as ThreadType;
+    const threadId = fullyQualifiedId(thread);
+    return <CommentContainer key={threadId} anchor={anchor} current={currentId === threadId} {...props} />;
+  });
 };

package/src/components/ThreadComplementary.tsx

@@ -5,18 +5,17 @@
 import React, { useCallback, useMemo } from 'react';
 
 import {
-  createIntent,
+  Capabilities,
   LayoutAction,
+  createIntent,
   useCapability,
   useCapabilities,
   useIntentDispatcher,
-  Capabilities,
 } from '@dxos/app-framework';
-import { Filter, Obj, Query } from '@dxos/echo';
-import { RelationSourceId } from '@dxos/echo-schema';
+import { Filter, Obj, Query, Relation } from '@dxos/echo';
 import { fullyQualifiedId, getSpace, useQuery } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
-import { useTranslation } from '@dxos/react-ui';
+import { useThemeContext, useTranslation } from '@dxos/react-ui';
 import { useAttended } from '@dxos/react-ui-attention';
 import { StackItem } from '@dxos/react-ui-stack';
 import { Tabs } from '@dxos/react-ui-tabs';
@@ -31,9 +30,12 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
   const { dispatchPromise: dispatch } = useIntentDispatcher();
   const identity = useIdentity();
   const { t } = useTranslation(THREAD_PLUGIN);
+  const { tx } = useThemeContext();
+  const subjectId = fullyQualifiedId(subject);
 
   const { state, getViewState } = useCapability(ThreadCapabilities.MutableState);
-  const viewState = getViewState(fullyQualifiedId(subject));
+  const drafts = state.drafts[subjectId];
+  const viewState = useMemo(() => getViewState(subjectId), [getViewState, subjectId]);
   const { showResolvedThreads } = viewState;
   const onChangeViewState = useCallback(
     (nextValue: string) => {
@@ -41,7 +43,6 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
     },
     [viewState],
   );
-  const drafts = state.drafts[fullyQualifiedId(subject)];
 
   const anchorSorts = useCapabilities(Capabilities.AnchorSort);
   const sort = useMemo(
@@ -53,15 +54,14 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
   const objectsAnchoredTo = useQuery(space, Query.select(Filter.ids(subject.id)).targetOf(AnchoredTo));
   const anchors = objectsAnchoredTo
     .toSorted((a, b) => sort?.(a, b) ?? 0)
-    .filter((anchor) => Obj.instanceOf(ThreadType, anchor[RelationSourceId]))
+    .filter((anchor) => Obj.instanceOf(ThreadType, Relation.getSource(anchor)))
     .concat(drafts ?? []);
 
   const attended = useAttended();
-  const qualifiedSubjectId = fullyQualifiedId(subject);
 
   const handleAttend = useCallback(
     (anchor: AnchoredTo) => {
-      const thread = anchor[RelationSourceId] as ThreadType;
+      const thread = Relation.getSource(anchor) as ThreadType;
       const threadId = fullyQualifiedId(thread);
 
       if (state.current !== threadId) {
@@ -91,7 +91,7 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
         createIntent(ThreadAction.AddMessage, { anchor, subject, sender: { identityDid: identity?.did }, text }),
       );
 
-      const thread = anchor[RelationSourceId] as ThreadType;
+      const thread = Relation.getSource(anchor) as ThreadType;
       state.current = fullyQualifiedId(thread);
     },
     [dispatch, identity, subject],
@@ -99,7 +99,7 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
 
   const handleResolve = useCallback(
     (anchor: AnchoredTo) =>
-      dispatch(createIntent(ThreadAction.ToggleResolved, { thread: anchor[RelationSourceId] as ThreadType })),
+      dispatch(createIntent(ThreadAction.ToggleResolved, { thread: Relation.getSource(anchor) as ThreadType })),
     [dispatch],
   );
 
@@ -117,7 +117,7 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
   const comments = (
     <CommentsContainer
       anchors={anchors}
-      currentId={attended.includes(qualifiedSubjectId) ? state.current : undefined}
+      currentId={attended.includes(subjectId) ? state.current : undefined}
       showResolvedThreads={showResolvedThreads}
       onAttend={handleAttend}
       onComment={handleComment}
@@ -131,12 +131,11 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
     <StackItem.Content toolbar>
       <Tabs.Root
         value={showResolvedThreads ? 'all' : 'unresolved'}
-        onValueChange={onChangeViewState}
         orientation='horizontal'
         classNames='contents [&_[role="tabpanel"]]:min-bs-0 [&_[role="tabpanel"]]:overflow-y-auto [&_[role="tabpanel"]]:scrollbar-thin'
+        onValueChange={onChangeViewState}
       >
-        {/* TODO(burdon): Should have common container/frags with toolbar. Standardize border-be for all StackItem toolbars. */}
-        <Tabs.Tablist classNames='p-1 gap-1 overflow-y-hidden border-be border-subduedSeparator'>
+        <Tabs.Tablist classNames={tx('toolbar.root', 'toolbar', {})}>
           <Tabs.Tab value='unresolved' classNames='text-sm'>
             {t('show unresolved label')}
           </Tabs.Tab>

package/src/extensions/threads.ts

@@ -7,8 +7,7 @@ import { EditorView } from '@codemirror/view';
 import { computed, effect } from '@preact/signals-core';
 
 import { createIntent, type PromiseIntentDispatcher } from '@dxos/app-framework';
-import { Filter, Obj, Query } from '@dxos/echo';
-import { RelationSourceId } from '@dxos/echo-schema';
+import { Filter, Obj, Query, Relation } from '@dxos/echo';
 import { type DocumentType } from '@dxos/plugin-markdown/types';
 import { getSpace, getTextInRange, createDocAccessor, fullyQualifiedId, getSource } from '@dxos/react-client/echo';
 import { comments, createExternalCommentSync } from '@dxos/react-ui-editor';
@@ -41,7 +40,7 @@ export const threads = (state: ThreadState, doc?: DocumentType, dispatch?: Promi
   const anchors = computed(() =>
     query.objects
       .filter((anchor) => {
-        const thread = anchor[RelationSourceId];
+        const thread = Relation.getSource(anchor);
         return Obj.instanceOf(ThreadType, thread) && thread.status !== 'resolved';
       })
       .concat(state.drafts[fullyQualifiedId(doc)] ?? []),
@@ -61,7 +60,7 @@ export const threads = (state: ThreadState, doc?: DocumentType, dispatch?: Promi
             // Only update if the name has changed, otherwise this will cause an infinite loop.
             // Skip if the name is empty; this means comment text was deleted, but thread name should remain.
             const name = getName(doc, anchor.anchor);
-            const thread = anchor[RelationSourceId] as ThreadType;
+            const thread = Relation.getSource(anchor) as ThreadType;
             if (name && name !== thread.name) {
               thread.name = name;
             }
@@ -76,7 +75,7 @@ export const threads = (state: ThreadState, doc?: DocumentType, dispatch?: Promi
       () =>
         anchors.value
           .filter((anchor) => anchor.anchor)
-          .map((anchor) => ({ id: fullyQualifiedId(anchor[RelationSourceId]), cursor: anchor.anchor })),
+          .map((anchor) => ({ id: fullyQualifiedId(Relation.getSource(anchor)), cursor: anchor.anchor })),
     ),
 
     comments({
@@ -102,7 +101,7 @@ export const threads = (state: ThreadState, doc?: DocumentType, dispatch?: Promi
       onUpdate: ({ id, cursor }) => {
         const draft = state.drafts[fullyQualifiedId(doc)]?.find((thread) => fullyQualifiedId(thread) === id);
         if (draft) {
-          const thread = draft[RelationSourceId] as ThreadType;
+          const thread = Relation.getSource(draft) as ThreadType;
           thread.name = getName(doc, cursor);
           draft.anchor = cursor;
         }

package/src/translations.ts

@@ -2,14 +2,19 @@
 // Copyright 2023 DXOS.org
 //
 
+import { Type } from '@dxos/echo';
+
 import { THREAD_PLUGIN } from './meta';
 import { ChannelType } from './types';
 
 export default [
   {
     'en-US': {
-      [ChannelType.typename]: {
+      [Type.getTypename(ChannelType)]: {
         'typename label': 'Channel',
+        'typename label_zero': 'Channels',
+        'typename label_one': 'Channel',
+        'typename label_other': 'Channels',
         'object name placeholder': 'New channel',
       },
       [THREAD_PLUGIN]: {
@@ -39,7 +44,7 @@ export default [
         'open comments panel label': 'Show Comments',
         'comments label': 'Comments',
         'show all label': 'All comments',
-        'show unresolved label': 'Unresolved only',
+        'show unresolved label': 'Unresolved comments',
 
         'channel companion label': 'Channel',
         'call panel label': 'Active Call',