@dxos/plugin-thread 0.8.4-main.dedc0f3 → 0.8.4-main.e8ec1fe

package/src/components/Lobby/Lobby.tsx

@@ -4,7 +4,7 @@
 
 import React, { type FC, type PropsWithChildren, useEffect, useState } from 'react';
 
-import { useCapability } from '@dxos/app-framework';
+import { useCapability } from '@dxos/app-framework/react';
 import { type ThemedClassName, useTranslation } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 

package/src/components/Media/VideoObject.stories.tsx

@@ -2,15 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type StoryObj } from '@storybook/react-vite';
 import React, { useEffect, useState } from 'react';
 
 import { scheduleTask } from '@dxos/async';
 import { Context } from '@dxos/context';
 import { log } from '@dxos/log';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
 import { getUserMediaTrack } from '../../calls';
 import { ResponsiveContainer } from '../ResponsiveGrid';
@@ -23,9 +21,13 @@ const DefaultStory = (props: VideoObjectProps) => {
   useEffect(() => {
     const ctx = new Context();
     scheduleTask(ctx, async () => {
-      const stream = new MediaStream();
-      stream.addTrack(await getUserMediaTrack('videoinput'));
-      setVideoStream(stream);
+      try {
+        const stream = new MediaStream();
+        stream.addTrack(await getUserMediaTrack('videoinput'));
+        setVideoStream(stream);
+      } catch (err) {
+        log.catch(err);
+      }
     });
 
     return () => {
@@ -45,7 +47,10 @@ const meta = {
   title: 'plugins/plugin-thread/VideoObject',
   component: VideoObject,
   render: DefaultStory,
-  decorators: [withTheme, withLayout({ fullscreen: true, classNames: 'justify-center' })],
+  decorators: [withTheme],
+  parameters: {
+    layout: 'fullscreen',
+  },
 };
 
 export default meta;

package/src/components/Media/VideoObject.tsx

@@ -32,7 +32,7 @@ export const VideoObject = memo(
     return (
       <video
         className={mx(
-          'w-full aspect-video',
+          'is-full aspect-video',
           flip && 'scale-x-[-1]',
           contain ? 'object-contain' : 'object-cover',
           classNames,

package/src/components/MessageContainer.tsx

@@ -5,7 +5,7 @@
 import { EditorView } from '@codemirror/view';
 import React, { forwardRef, useCallback, useEffect, useRef, useState } from 'react';
 
-import { Surface } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/react';
 import { type Obj, Ref, type Type } from '@dxos/echo';
 import { PublicKey } from '@dxos/react-client';
 import { type SpaceMember } from '@dxos/react-client/echo';
@@ -14,7 +14,7 @@ import { IconButton, useOnTransition, useThemeContext, useTranslation } from '@d
 import { createBasicExtensions, createThemeExtensions, useTextEditor } from '@dxos/react-ui-editor';
 import { hoverableControlItem, hoverableControls, hoverableFocusedWithinControls, mx } from '@dxos/react-ui-theme';
 import { MessageHeading, MessageRoot } from '@dxos/react-ui-thread';
-import { type DataType } from '@dxos/schema';
+import { type ContentBlock, type Message } from '@dxos/types';
 
 import { useOnEditAnalytics } from '../hooks';
 import { meta } from '../meta';
@@ -26,7 +26,7 @@ export const buttonGroupClassNames = 'flex flex-row items-center gap-0.5 pie-2';
 export const buttonClassNames = '!p-1 transition-opacity';
 
 export type MessageContainerProps = {
-  message: DataType.Message;
+  message: Message.Message;
   members: SpaceMember[];
   editable?: boolean;
   onDelete?: (id: string) => void;
@@ -116,7 +116,7 @@ const TextboxBlock = ({
   isAuthor,
   editing,
 }: {
-  block: DataType.MessageBlock.Text;
+  block: ContentBlock.Text;
   editing?: boolean;
   isAuthor?: boolean;
   identity?: Identity;
@@ -158,7 +158,7 @@ const TextboxBlock = ({
   return <div role='none' ref={parentRef} className='mie-4' {...focusAttributes} />;
 };
 
-const ProposalBlock = ({ block }: { block: DataType.MessageBlock.Proposal }) => {
+const ProposalBlock = ({ block }: { block: ContentBlock.Proposal }) => {
   return (
     <div role='none' className='mie-4 italic'>
       {block.text}
@@ -176,7 +176,7 @@ const MessageBlockObjectTile = forwardRef<HTMLDivElement, { subject: Obj.Any }>(
   return (
     <div
       role='group'
-      className={mx('grid col-span-3 py-1 pr-4', hoverableControls, hoverableFocusedWithinControls)}
+      className={mx('grid col-span-3 plb-1 pr-4', hoverableControls, hoverableFocusedWithinControls)}
       ref={forwardedRef}
     >
       <Surface role='card' limit={1} data={{ subject }} fallback={title} />

package/src/components/Participant/Participant.tsx

@@ -4,7 +4,7 @@
 
 import React, { memo, useMemo } from 'react';
 
-import { useCapability } from '@dxos/app-framework';
+import { useCapability } from '@dxos/app-framework/react';
 
 import { type EncodedTrackName, type UserState } from '../../calls';
 import { ThreadCapabilities } from '../../capabilities';

package/src/components/ResponsiveGrid/ResponsiveContainer.stories.tsx

@@ -2,12 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
 import { translations } from '../../translations';
 import { VideoObject as VideoObjectComponent } from '../Media';
@@ -17,8 +15,9 @@ import { ResponsiveContainer } from './ResponsiveContainer';
 const meta = {
   title: 'plugins/plugin-thread/ResponsiveContainer',
   component: ResponsiveContainer,
-  decorators: [withTheme, withLayout({ fullscreen: true })],
+  decorators: [withTheme],
   parameters: {
+    layout: 'fullscreen',
     translations,
   },
 } satisfies Meta<typeof ResponsiveContainer>;

package/src/components/ResponsiveGrid/ResponsiveContainer.tsx

@@ -18,11 +18,11 @@ import { mx } from '@dxos/react-ui-theme';
 export const ResponsiveContainer = ({ children }: PropsWithChildren) => {
   return (
     // Outer container that takes full size of parent.
-    <div role='none' className='relative flex w-full h-full'>
+    <div role='none' className='relative flex is-full bs-full'>
       {/* Absolute positioning layer for centering content. */}
       <div role='none' className='absolute inset-0 flex justify-center items-center'>
         {/* Content container that maintains given aspect ratio and proper scaling. */}
-        <div role='none' className={mx('max-h-full max-w-full w-auto h-auto aspect-video')}>
+        <div role='none' className={mx('max-bs-full max-is-full is-auto bs-auto aspect-video')}>
           {children}
         </div>
       </div>

package/src/components/ResponsiveGrid/ResponsiveGrid.stories.tsx

@@ -2,13 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useEffect, useState } from 'react';
 
 import { faker } from '@dxos/random';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
 import { translations } from '../../translations';
 
@@ -43,7 +41,7 @@ const TestCell = ({ item, ...props }: ResponsiveGridItemProps<TestItem>) => {
       {item.type === 'image' && <img className='aspect-video object-contain' src={item.imageUrl} />}
       {item.type === 'video' && (
         <video
-          className='w-full aspect-video object-cover rounded-md'
+          className='is-full aspect-video object-cover rounded-md'
           src={item.videoUrl}
           playsInline
           autoPlay
@@ -94,8 +92,9 @@ const meta = {
   title: 'plugins/plugin-thread/ResponsiveGrid',
   component: ResponsiveGrid as any,
   render: DefaultStory,
-  decorators: [withTheme, withLayout({ fullscreen: true, classNames: 'justify-center' })],
+  decorators: [withTheme],
   parameters: {
+    layout: 'fullscreen',
     translations,
   },
 } satisfies Meta<typeof DefaultStory>;

package/src/components/ResponsiveGrid/ResponsiveGrid.tsx

@@ -18,7 +18,7 @@ const MIN_GALLERY_HEIGHT = 250;
 
 const DEFAULT_GAP = 8;
 
-const maxImageSize = 'w-[2560px] h-[1440px]';
+const maxImageSize = 'is-[2560px] bs-[1440px]';
 
 /**
  * Props for the ResponsiveGrid component.
@@ -136,13 +136,13 @@ export const ResponsiveGrid = <T extends object = any>({
   );
 
   return (
-    <div ref={containerRef} className={mx('relative w-full h-full', classNames)}>
+    <div ref={containerRef} className={mx('relative is-full bs-full', classNames)}>
       {/* Placeholder elements to calculate layout. */}
       <div className='absolute inset-0 flex flex-col grow gap-2'>
         {/* Pinned item. */}
         {pinnedItem && (
           <div
-            className={mx('flex grow-[2] shrink overflow-hidden justify-center items-center', hideGallery && 'h-full')}
+            className={mx('flex grow-[2] shrink overflow-hidden justify-center items-center', hideGallery && 'bs-full')}
             style={hideGallery ? {} : { height: dividerHeight }}
           >
             <SoloItem id={getId(pinnedItem)} debug={debug} />
@@ -157,7 +157,7 @@ export const ResponsiveGrid = <T extends object = any>({
             style={hideGallery ? {} : { minHeight: MIN_GALLERY_HEIGHT }}
           >
             {mainItems.length === 1 && (
-              <div style={{ width: cellWidth }} className='flex h-full'>
+              <div style={{ width: cellWidth }} className='flex bs-full'>
                 <SoloItem id={getId(mainItems[0])} debug={debug} />
               </div>
             )}
@@ -176,7 +176,7 @@ export const ResponsiveGrid = <T extends object = any>({
                     key={getId(item)}
                     {...{ 'data-grid-item': getId(item) }}
                     className={mx(
-                      'aspect-video max-h-full max-w-full w-auto h-auto',
+                      'aspect-video max-bs-full max-is-full is-auto bs-auto',
                       debug && 'border border-primary-500',
                     )}
                   />

package/src/components/ResponsiveGrid/ResponsiveGridItem.tsx

@@ -76,7 +76,7 @@ export const ResponsiveGridItem = <T extends object = any>({
   return (
     <div
       className={mx(
-        'relative w-full h-full group',
+        'relative is-full bs-full group',
         'rounded-md outline outline-2 outline-neutral-900 transition-[outline-color] duration-500',
         speakingIndicator ? 'outline-green-500' : !video && 'outline-separator',
         classNames,
@@ -106,7 +106,10 @@ export const ResponsiveGridItem = <T extends object = any>({
           {/* {self && <Icon icon='ph--asterisk--regular' size={pinned ? 5 : 4} />} */}
           {screenshare && <Icon icon='ph--broadcast--regular' size={pinned ? 5 : 4} />}
           <div
-            className={mx('bg-neutral-800 text-neutral-100 py-0.5 truncate rounded', pinned ? 'px-2' : 'px-1 text-xs')}
+            className={mx(
+              'bg-neutral-800 text-neutral-100 plb-0.5 truncate rounded',
+              pinned ? 'pli-2' : 'pli-1 text-xs',
+            )}
           >
             {name}
           </div>

package/src/components/{ThreadComplementary.tsx → ThreadCompanion.tsx}

@@ -4,36 +4,28 @@
 
 import React, { useCallback, useMemo } from 'react';
 
-import {
-  Capabilities,
-  CollaborationActions,
-  LayoutAction,
-  createIntent,
-  useCapabilities,
-  useCapability,
-  useIntentDispatcher,
-} from '@dxos/app-framework';
+import { Capabilities, CollaborationActions, LayoutAction, createIntent } from '@dxos/app-framework';
+import { useCapabilities, useCapability, useIntentDispatcher } from '@dxos/app-framework/react';
 import { Filter, Obj, Query, Relation } from '@dxos/echo';
-import { Ref, fullyQualifiedId, getSpace, useQuery } from '@dxos/react-client/echo';
+import { Ref, getSpace, useQuery } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
-import { useThemeContext, useTranslation } from '@dxos/react-ui';
+import { 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';
 import { mx } from '@dxos/react-ui-theme';
-import { AnchoredTo } from '@dxos/schema';
+import { AnchoredTo, Thread } from '@dxos/types';
 
 import { ThreadCapabilities } from '../capabilities';
 import { CommentsContainer, type CommentsContainerProps } from '../components';
 import { meta } from '../meta';
-import { ThreadAction, ThreadType } from '../types';
+import { ThreadAction } from '../types';
 
-export const ThreadComplementary = ({ subject }: { subject: any }) => {
+export const ThreadCompanion = ({ subject }: { subject: any }) => {
   const { t } = useTranslation(meta.id);
   const { dispatchPromise: dispatch } = useIntentDispatcher();
   const identity = useIdentity();
-  const { tx } = useThemeContext();
-  const subjectId = fullyQualifiedId(subject);
+  const subjectId = Obj.getDXN(subject).toString();
 
   const { state, getViewState } = useCapability(ThreadCapabilities.MutableState);
   const drafts = state.drafts[subjectId];
@@ -53,18 +45,18 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
   );
 
   const space = getSpace(subject);
-  const objectsAnchoredTo = useQuery(space, Query.select(Filter.ids(subject.id)).targetOf(AnchoredTo));
+  const objectsAnchoredTo = useQuery(space, Query.select(Filter.ids(subject.id)).targetOf(AnchoredTo.AnchoredTo));
   const anchors = objectsAnchoredTo
     .toSorted((a, b) => sort?.(a, b) ?? 0)
-    .filter((anchor) => Obj.instanceOf(ThreadType, Relation.getSource(anchor)))
+    .filter((anchor) => Obj.instanceOf(Thread.Thread, Relation.getSource(anchor)))
     .concat(drafts ?? []);
 
   const attended = useAttended();
 
   const handleAttend = useCallback(
-    (anchor: AnchoredTo) => {
-      const thread = Relation.getSource(anchor) as ThreadType;
-      const threadId = fullyQualifiedId(thread);
+    (anchor: AnchoredTo.AnchoredTo) => {
+      const thread = Relation.getSource(anchor) as Thread.Thread;
+      const threadId = Obj.getDXN(thread).toString();
 
       if (state.current !== threadId) {
         state.current = threadId;
@@ -75,7 +67,7 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
         void dispatch(
           createIntent(LayoutAction.ScrollIntoView, {
             part: 'current',
-            subject: fullyQualifiedId(subject),
+            subject: Obj.getDXN(subject).toString(),
             options: {
               cursor: anchor.anchor,
               ref: threadId,
@@ -88,37 +80,52 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
   );
 
   const handleComment = useCallback(
-    async (anchor: AnchoredTo, text: string) => {
+    async (anchor: AnchoredTo.AnchoredTo, text: string) => {
       await dispatch(
-        createIntent(ThreadAction.AddMessage, { anchor, subject, sender: { identityDid: identity?.did }, text }),
+        createIntent(ThreadAction.AddMessage, {
+          anchor,
+          subject,
+          sender: { identityDid: identity?.did },
+          text,
+        }),
       );
 
-      const thread = Relation.getSource(anchor) as ThreadType;
-      state.current = fullyQualifiedId(thread);
+      const thread = Relation.getSource(anchor) as Thread.Thread;
+      state.current = Obj.getDXN(thread).toString();
     },
     [dispatch, identity, subject],
   );
 
   const handleResolve = useCallback(
-    (anchor: AnchoredTo) =>
-      dispatch(createIntent(ThreadAction.ToggleResolved, { thread: Relation.getSource(anchor) as ThreadType })),
+    (anchor: AnchoredTo.AnchoredTo) =>
+      dispatch(
+        createIntent(ThreadAction.ToggleResolved, {
+          thread: Relation.getSource(anchor) as Thread.Thread,
+        }),
+      ),
     [dispatch],
   );
 
   const handleThreadDelete = useCallback(
-    (anchor: AnchoredTo) => dispatch(createIntent(ThreadAction.Delete, { anchor, subject })),
+    (anchor: AnchoredTo.AnchoredTo) => dispatch(createIntent(ThreadAction.Delete, { anchor, subject })),
     [dispatch, subject],
   );
 
   const handleMessageDelete = useCallback(
-    (anchor: AnchoredTo, messageId: string) =>
-      dispatch(createIntent(ThreadAction.DeleteMessage, { anchor, subject, messageId })),
+    (anchor: AnchoredTo.AnchoredTo, messageId: string) =>
+      dispatch(
+        createIntent(ThreadAction.DeleteMessage, {
+          anchor,
+          subject,
+          messageId,
+        }),
+      ),
     [dispatch, subject],
   );
 
   const handleAcceptProposal = useCallback<NonNullable<CommentsContainerProps['onAcceptProposal']>>(
     async (anchor, messageId) => {
-      const thread = Relation.getSource(anchor) as ThreadType;
+      const thread = Relation.getSource(anchor) as Thread.Thread;
       const messageIndex = thread.messages.findIndex(Ref.hasObjectId(messageId));
       const message = thread.messages[messageIndex]?.target;
       const proposal = message?.blocks.find((block) => block._tag === 'proposal');
@@ -153,7 +160,7 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
   );
 
   return (
-    <StackItem.Content toolbar classNames='overflow-hidden'>
+    <StackItem.Content toolbar>
       <Tabs.Root
         value={showResolvedThreads ? 'all' : 'unresolved'}
         orientation='horizontal'
@@ -163,7 +170,7 @@ export const ThreadComplementary = ({ subject }: { subject: any }) => {
         onValueChange={onChangeViewState}
       >
         {/* TODO(burdon): Standardize (like Tollbar). */}
-        <Tabs.Tablist classNames={mx('bg-toolbarSurface border-b border-subduedSeparator')}>
+        <Tabs.Tablist classNames={mx('bg-toolbarSurface border-be border-subduedSeparator')}>
           <Tabs.Tab value='unresolved' classNames='text-sm'>
             {t('show unresolved label')}
           </Tabs.Tab>

package/src/components/ThreadSettings.tsx

@@ -4,14 +4,13 @@
 
 import React from 'react';
 
-// import { useTranslation } from '@dxos/react-ui';
+import { useTranslation } from '@dxos/react-ui';
 import { ControlPage } from '@dxos/react-ui-form';
 
-// import { meta } from '../meta';
+import { meta } from '../meta';
 import type { ThreadSettingsProps } from '../types';
 
-export const ThreadSettings = ({ settings }: { settings: ThreadSettingsProps }) => {
-  // const { t } = useTranslation(meta.id);
-
+export const ThreadSettings = ({ settings: _settings }: { settings: ThreadSettingsProps }) => {
+  const { t: _t } = useTranslation(meta.id);
   return <ControlPage></ControlPage>;
 };

package/src/components/index.ts

@@ -4,9 +4,6 @@
 
 import { lazy } from 'react';
 
-export const ChannelContainer = lazy(() => import('./ChannelContainer'));
-export const ChatContainer = lazy(() => import('./ChatContainer'));
-
 // TODO(wittjosiah): Suspense boundary for sidebar?
 export * from './Call';
 export * from './CallDebugPanel';
@@ -14,5 +11,8 @@ export * from './CallSidebar';
 export * from './CommentsContainer';
 export * from './CommentsThreadContainer';
 export * from './MessageContainer';
-export * from './ThreadComplementary';
+export * from './ThreadCompanion';
 export * from './ThreadSettings';
+
+export const ChannelContainer = lazy(() => import('./ChannelContainer'));
+export const ChatContainer = lazy(() => import('./ChatContainer'));

package/src/components/testing.ts

@@ -6,17 +6,15 @@ import { Obj, Ref } from '@dxos/echo';
 import { IdentityDid } from '@dxos/keys';
 import { faker } from '@dxos/random';
 import { type Identity } from '@dxos/react-client/halo';
-import { DataType } from '@dxos/schema';
+import { Message, Thread } from '@dxos/types';
 
-import { ThreadType } from '../types';
-
-export const createCommentThread = (identity: Identity): ThreadType => {
-  return Obj.make(ThreadType, {
+export const createCommentThread = (identity: Identity): Thread.Thread => {
+  return Thread.make({
     name: 'Comment',
     messages: faker.helpers.multiple(
       () =>
         Ref.make(
-          Obj.make(DataType.Message, {
+          Obj.make(Message.Message, {
             created: new Date().toISOString(),
             sender: {
               identityDid: faker.datatype.boolean() ? identity.did : IdentityDid.random(),
@@ -30,13 +28,13 @@ export const createCommentThread = (identity: Identity): ThreadType => {
   });
 };
 
-export const createProposalThread = (identity: Identity): ThreadType => {
-  return Obj.make(ThreadType, {
+export const createProposalThread = (identity: Identity): Thread.Thread => {
+  return Thread.make({
     name: 'Proposal',
     messages: faker.helpers.multiple(
       () =>
         Ref.make(
-          Obj.make(DataType.Message, {
+          Obj.make(Message.Message, {
             created: new Date().toISOString(),
             sender: {
               identityDid: faker.datatype.boolean() ? identity.did : IdentityDid.random(),

package/src/extensions/threads.ts

@@ -9,11 +9,11 @@ import { computed, effect } from '@preact/signals-core';
 import { type PromiseIntentDispatcher, createIntent } from '@dxos/app-framework';
 import { Filter, Obj, Query, Relation } from '@dxos/echo';
 import { type Markdown } from '@dxos/plugin-markdown/types';
-import { createDocAccessor, fullyQualifiedId, getSource, getSpace, getTextInRange } from '@dxos/react-client/echo';
+import { createDocAccessor, getSource, getSpace, getTextInRange } from '@dxos/react-client/echo';
 import { comments, createExternalCommentSync } from '@dxos/react-ui-editor';
-import { AnchoredTo } from '@dxos/schema';
+import { AnchoredTo, Thread } from '@dxos/types';
 
-import { ThreadAction, type ThreadState, ThreadType } from '../types';
+import { ThreadAction, type ThreadState } from '../types';
 
 // TODO(burdon): Factor out.
 const getName = (doc: Markdown.Document, anchor: string): string | undefined => {
@@ -34,16 +34,16 @@ export const threads = (state: ThreadState, doc?: Markdown.Document, dispatch?:
     return [comments()];
   }
 
-  const query = space.db.query(Query.select(Filter.ids(doc.id)).targetOf(AnchoredTo));
+  const query = space.db.query(Query.select(Filter.ids(doc.id)).targetOf(AnchoredTo.AnchoredTo));
   const unsubscribe = query.subscribe();
 
   const anchors = computed(() =>
     query.objects
       .filter((anchor) => {
         const thread = Relation.getSource(anchor);
-        return Obj.instanceOf(ThreadType, thread) && thread.status !== 'resolved';
+        return Obj.instanceOf(Thread.Thread, thread) && thread.status !== 'resolved';
       })
-      .concat(state.drafts[fullyQualifiedId(doc)] ?? []),
+      .concat(state.drafts[Obj.getDXN(doc).toString()] ?? []),
   );
 
   return [
@@ -60,7 +60,7 @@ export const threads = (state: ThreadState, doc?: Markdown.Document, dispatch?:
             // 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 = Relation.getSource(anchor) as ThreadType;
+            const thread = Relation.getSource(anchor) as Thread.Thread;
             if (name && name !== thread.name) {
               thread.name = name;
             }
@@ -70,24 +70,33 @@ export const threads = (state: ThreadState, doc?: Markdown.Document, dispatch?:
     }),
 
     createExternalCommentSync(
-      fullyQualifiedId(doc),
+      Obj.getDXN(doc).toString(),
       (sink) => effect(() => sink()),
       () =>
         anchors.value
           .filter((anchor) => anchor.anchor)
-          .map((anchor) => ({ id: fullyQualifiedId(Relation.getSource(anchor)), cursor: anchor.anchor })),
+          .map((anchor) => ({
+            id: Obj.getDXN(Relation.getSource(anchor)).toString(),
+            cursor: anchor.anchor,
+          })),
     ),
 
     comments({
-      id: fullyQualifiedId(doc),
+      id: Obj.getDXN(doc).toString(),
       onCreate: ({ cursor }) => {
         const name = getName(doc, cursor);
-        void dispatch(createIntent(ThreadAction.Create, { anchor: cursor, name, subject: doc }));
+        void dispatch(
+          createIntent(ThreadAction.Create, {
+            anchor: cursor,
+            name,
+            subject: doc,
+          }),
+        );
       },
       onDelete: ({ id }) => {
-        const draft = state.drafts[fullyQualifiedId(doc)];
+        const draft = state.drafts[Obj.getDXN(doc).toString()];
         if (draft) {
-          const index = draft.findIndex((thread) => fullyQualifiedId(thread) === id);
+          const index = draft.findIndex((thread) => Obj.getDXN(thread).toString() === id);
           if (index !== -1) {
             draft.splice(index, 1);
           }
@@ -99,9 +108,9 @@ export const threads = (state: ThreadState, doc?: Markdown.Document, dispatch?:
         }
       },
       onUpdate: ({ id, cursor }) => {
-        const draft = state.drafts[fullyQualifiedId(doc)]?.find((thread) => fullyQualifiedId(thread) === id);
+        const draft = state.drafts[Obj.getDXN(doc).toString()]?.find((thread) => Obj.getDXN(thread).toString() === id);
         if (draft) {
-          const thread = Relation.getSource(draft) as ThreadType;
+          const thread = Relation.getSource(draft) as Thread.Thread;
           thread.name = getName(doc, cursor);
           draft.anchor = cursor;
         }
@@ -109,7 +118,7 @@ export const threads = (state: ThreadState, doc?: Markdown.Document, dispatch?:
         const relation = query.objects.find((object) => getSource(object).id === id);
         if (relation) {
           const thread = getSource(relation);
-          if (Obj.instanceOf(ThreadType, thread)) {
+          if (Obj.instanceOf(Thread.Thread, thread)) {
             thread.name = getName(doc, cursor);
             relation.anchor = cursor;
           }