@dxos/plugin-thread 0.8.4-main.406dc2a → 0.8.4-main.548089c

package/src/components/CommentsContainer.tsx

@@ -4,18 +4,17 @@
 
 import React, { useEffect } from 'react';
 
-import { Relation } from '@dxos/echo';
-import { fullyQualifiedId } from '@dxos/react-client/echo';
+import { Obj, Relation } from '@dxos/echo';
 import { Callout, Icon, Trans, useTranslation } from '@dxos/react-ui';
-import { type AnchoredTo } from '@dxos/schema';
+import { type AnchoredTo } from '@dxos/types';
 
 import { meta } from '../meta';
-import { type ThreadType } from '../types';
+import { type Thread } from '../types';
 
 import { CommentsThreadContainer, type CommentsThreadContainerProps } from './CommentsThreadContainer';
 
 export type CommentsContainerProps = Omit<CommentsThreadContainerProps, 'anchor' | 'current'> & {
-  anchors: AnchoredTo[];
+  anchors: AnchoredTo.AnchoredTo[];
   currentId?: string;
   showResolvedThreads?: boolean;
 };
@@ -63,8 +62,8 @@ export const CommentsContainer = ({ anchors, currentId, showResolvedThreads, ...
   return (
     <div>
       {filteredAnchors.map((anchor) => {
-        const thread = Relation.getSource(anchor) as ThreadType;
-        const threadId = fullyQualifiedId(thread);
+        const thread = Relation.getSource(anchor) as Thread.Thread;
+        const threadId = Obj.getDXN(thread).toString();
         return <CommentsThreadContainer key={threadId} anchor={anchor} current={currentId === threadId} {...props} />;
       })}
     </div>

package/src/components/CommentsThreadContainer.tsx

@@ -4,32 +4,37 @@
 
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 
-import { Ref, Relation } from '@dxos/echo';
-import { fullyQualifiedId, getSpace, useMembers } from '@dxos/react-client/echo';
+import { Obj, Ref, Relation } from '@dxos/echo';
+import { getSpace, useMembers } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { IconButton, Tag, Tooltip, useThemeContext, useTranslation } from '@dxos/react-ui';
 import { createBasicExtensions, createThemeExtensions, listener } from '@dxos/react-ui-editor';
 import { hoverableControlItem, hoverableControls, hoverableFocusedWithinControls, mx } from '@dxos/react-ui-theme';
-import { MessageTextbox, type MessageTextboxProps, Thread, type ThreadRootProps } from '@dxos/react-ui-thread';
-import { type AnchoredTo } from '@dxos/schema';
+import {
+  MessageTextbox,
+  type MessageTextboxProps,
+  Thread as ThreadComponent,
+  type ThreadRootProps,
+} from '@dxos/react-ui-thread';
+import { type AnchoredTo } from '@dxos/types';
 import { isNonNullable } from '@dxos/util';
 
 import { useStatus } from '../hooks';
 import { meta } from '../meta';
-import { type ThreadType } from '../types';
+import { type Thread } from '../types';
 import { getMessageMetadata } from '../util';
 
 import { command } from './command-extension';
 import { MessageContainer, buttonClassNames, buttonGroupClassNames } from './MessageContainer';
 
 export type CommentsThreadContainerProps = {
-  anchor: AnchoredTo;
-  onAttend?: (anchor: AnchoredTo) => void;
-  onComment?: (anchor: AnchoredTo, message: string) => void;
-  onResolve?: (anchor: AnchoredTo) => void;
-  onMessageDelete?: (anchor: AnchoredTo, messageId: string) => void;
-  onThreadDelete?: (anchor: AnchoredTo) => void;
-  onAcceptProposal?: (anchor: AnchoredTo, messageId: string) => void;
+  anchor: AnchoredTo.AnchoredTo;
+  onAttend?: (anchor: AnchoredTo.AnchoredTo) => void;
+  onComment?: (anchor: AnchoredTo.AnchoredTo, message: string) => void;
+  onResolve?: (anchor: AnchoredTo.AnchoredTo) => void;
+  onMessageDelete?: (anchor: AnchoredTo.AnchoredTo, messageId: string) => void;
+  onThreadDelete?: (anchor: AnchoredTo.AnchoredTo) => void;
+  onAcceptProposal?: (anchor: AnchoredTo.AnchoredTo, messageId: string) => void;
 } & Pick<ThreadRootProps, 'current'>;
 
 export const CommentsThreadContainer = ({
@@ -42,29 +47,29 @@ export const CommentsThreadContainer = ({
   onThreadDelete,
   onAcceptProposal,
 }: CommentsThreadContainerProps) => {
+  const { themeMode } = useThemeContext();
   const { t } = useTranslation(meta.id);
   const identity = useIdentity()!;
   const space = getSpace(anchor);
   const members = useMembers(space?.key);
   const detached = !anchor.anchor;
-  const thread = Relation.getSource(anchor) as ThreadType;
-  const activity = useStatus(space, fullyQualifiedId(thread));
+  const thread = Relation.getSource(anchor) as Thread.Thread;
+  const activity = useStatus(space, Obj.getDXN(thread).toString());
   const threadScrollRef = useRef<HTMLDivElement | null>(null);
-  const { themeMode } = useThemeContext();
 
-  const textboxMetadata = getMessageMetadata(fullyQualifiedId(thread), identity);
+  const textboxMetadata = getMessageMetadata(Obj.getDXN(thread).toString(), identity);
+
   // TODO(wittjosiah): This is a hack to reset the editor after a message is sent.
-  const [_count, _setCount] = useState(0);
-  const rerenderEditor = () => _setCount((count) => count + 1);
+  const [state, setState] = useState({});
   const messageRef = useRef('');
   const extensions = useMemo(
     () => [
       createBasicExtensions({ placeholder: t('message placeholder') }),
       createThemeExtensions({ themeMode }),
-      listener({ onChange: (text) => (messageRef.current = text) }),
+      listener({ onChange: ({ text }) => (messageRef.current = text) }),
       command,
     ],
-    [_count],
+    [state],
   );
 
   // TODO(thure): Factor out.
@@ -85,14 +90,14 @@ export const CommentsThreadContainer = ({
     onComment?.(anchor, messageRef.current);
     messageRef.current = '';
     scrollToEnd('instant');
-    rerenderEditor();
+    setState({});
 
     return true;
   }, [anchor, identity]);
 
   return (
-    <Thread.Root
-      id={fullyQualifiedId(thread)}
+    <ThreadComponent.Root
+      id={Obj.getDXN(thread).toString()}
       classNames='pbs-2 border-be border-subduedSeparator last:border-none'
       current={current}
       onClickCapture={handleAttend}
@@ -108,10 +113,10 @@ export const CommentsThreadContainer = ({
       >
         {detached ? (
           <Tooltip.Trigger asChild content={t('detached thread label')} side='top'>
-            <Thread.Header detached>{thread.name}</Thread.Header>
+            <ThreadComponent.Header detached>{thread.name}</ThreadComponent.Header>
           </Tooltip.Trigger>
         ) : (
-          <Thread.Header>{thread.name}</Thread.Header>
+          <ThreadComponent.Header>{thread.name}</ThreadComponent.Header>
         )}
         <div role='none' className={buttonGroupClassNames}>
           {thread.status === 'staged' && <Tag palette='neutral'>{t('draft button')}</Tag>}
@@ -160,10 +165,10 @@ export const CommentsThreadContainer = ({
       */}
       <MessageTextbox extensions={extensions} onSend={handleComment} {...textboxMetadata} />
 
-      <Thread.Status activity={activity}>{t('activity message')}</Thread.Status>
+      <ThreadComponent.Status activity={activity}>{t('activity message')}</ThreadComponent.Status>
 
       {/* NOTE(thure): This can’t also be the `overflow-anchor` because `ScrollArea` injects an interceding node that contains this necessary ref’d element. */}
       <div role='none' className='bs-px -mbs-px' ref={threadScrollRef} />
-    </Thread.Root>
+    </ThreadComponent.Root>
   );
 };

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.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.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 w-auto h-auto aspect-video')}>
           {children}
         </div>
       </div>

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

@@ -41,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

package/src/components/ResponsiveGrid/ResponsiveGrid.tsx

@@ -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 w-auto h-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

@@ -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 } from '@dxos/types';
 
 import { ThreadCapabilities } from '../capabilities';
 import { CommentsContainer, type CommentsContainerProps } from '../components';
 import { meta } from '../meta';
-import { ThreadAction, ThreadType } from '../types';
+import { Thread, ThreadAction } from '../types';
 
 export const ThreadComplementary = ({ 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');

package/src/components/testing.ts

@@ -6,17 +6,17 @@ 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 } from '@dxos/types';
 
-import { ThreadType } from '../types';
+import { Thread } 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 +30,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 } from '@dxos/types';
 
-import { ThreadAction, type ThreadState, ThreadType } from '../types';
+import { Thread, 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;
           }