@dxos/plugin-thread 0.6.11-staging.e6894a4 → 0.6.12-main.15a606f

package/dist/lib/browser/index.mjs

@@ -1,6 +1,6 @@
 import {
   ThreadAction
-} from "./chunk-GKPZHUT3.mjs";
+} from "./chunk-GJRBBPXI.mjs";
 import {
   ChatContainer,
   ChatHeading,
@@ -10,34 +10,30 @@ import {
   useAnalyticsCallback,
   useOnEditAnalytics,
   useStatus
-} from "./chunk-P7ZE5N5M.mjs";
+} from "./chunk-XF5QKI75.mjs";
 import {
   THREAD_ITEM,
   THREAD_PLUGIN,
   meta_default
-} from "./chunk-5IBJO53M.mjs";
+} from "./chunk-7NUYW5IW.mjs";
 
 // packages/plugins/plugin-thread/src/ThreadPlugin.tsx
-import { Chat } from "@phosphor-icons/react";
 import { computed, effect } from "@preact/signals-core";
-import React5, { useCallback as useCallback2 } from "react";
-import { LayoutAction, NavigationAction, parseIntentPlugin, parseNavigationPlugin, resolvePlugin, parseGraphPlugin, SLUG_PATH_SEPARATOR, SLUG_COLLECTION_INDICATOR, isLayoutParts, parseMetadataResolverPlugin, useResolvePlugins } from "@dxos/app-framework";
+import React6 from "react";
+import { LayoutAction as LayoutAction2, NavigationAction, parseIntentPlugin, parseNavigationPlugin, resolvePlugin, isLayoutParts, parseMetadataResolverPlugin } from "@dxos/app-framework";
 import { getTypename } from "@dxos/echo-schema";
 import { create as create2 } from "@dxos/echo-schema";
 import { LocalStorageStore } from "@dxos/local-storage";
-import { parseAttentionPlugin } from "@dxos/plugin-attention";
+import { log } from "@dxos/log";
 import { parseClientPlugin } from "@dxos/plugin-client";
-import { createExtension, isActionGroup } from "@dxos/plugin-graph";
-import { DocumentType } from "@dxos/plugin-markdown/types";
+import { createExtension, isActionGroup, toSignal } from "@dxos/plugin-graph";
 import { ObservabilityAction } from "@dxos/plugin-observability/meta";
 import { SpaceAction } from "@dxos/plugin-space";
 import { ThreadType, MessageType as MessageType2, ChannelType } from "@dxos/plugin-space/types";
-import { getSpace as getSpace2, getTextInRange, Filter, createDocAccessor, fullyQualifiedId, loadObjectReferences } from "@dxos/react-client/echo";
-import { ScrollArea } from "@dxos/react-ui";
-import { createAttendableAttributes } from "@dxos/react-ui-attention";
+import { getSpace as getSpace2, getTextInRange, createDocAccessor, fullyQualifiedId as fullyQualifiedId4, loadObjectReferences } from "@dxos/react-client/echo";
 import { comments, createExternalCommentSync, listener as listener2 } from "@dxos/react-ui-editor";
 import { translations as threadTranslations } from "@dxos/react-ui-thread";
-import { nonNullable as nonNullable2 } from "@dxos/util";
+import { nonNullable as nonNullable3 } from "@dxos/util";
 
 // packages/plugins/plugin-thread/src/components/index.ts
 import React4 from "react";
@@ -61,7 +57,7 @@ import { CheckCircle, X } from "@phosphor-icons/react";
 import React2, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { create } from "@dxos/echo-schema";
 import { MessageType } from "@dxos/plugin-space/types";
-import { getSpace, useMembers } from "@dxos/react-client/echo";
+import { fullyQualifiedId, getSpace, useMembers } from "@dxos/react-client/echo";
 import { useIdentity } from "@dxos/react-client/halo";
 import { Button, Tag, Tooltip, useThemeContext, useTranslation as useTranslation2 } from "@dxos/react-ui";
 import { createBasicExtensions, createThemeExtensions, listener } from "@dxos/react-ui-editor";
@@ -118,12 +114,12 @@ var CommentContainer = ({ thread, detached, context, current, autoFocusTextbox,
   const identity = useIdentity();
   const space = getSpace(thread);
   const members = useMembers(space?.key);
-  const activity = useStatus(space, thread.id);
+  const activity = useStatus(space, fullyQualifiedId(thread));
   const { t } = useTranslation2(THREAD_PLUGIN);
   const threadScrollRef = useRef(null);
   const [autoFocus, setAutoFocus] = useState(!!autoFocusTextbox);
   const { themeMode } = useThemeContext();
-  const textboxMetadata = getMessageMetadata(thread.id, identity);
+  const textboxMetadata = getMessageMetadata(fullyQualifiedId(thread), identity);
   const [_count, _setCount] = useState(0);
   const rerenderEditor = () => _setCount((count) => count + 1);
   const messageRef = useRef("");
@@ -172,12 +168,11 @@ var CommentContainer = ({ thread, detached, context, current, autoFocusTextbox,
     thread,
     identity
   ]);
-  const handleDeleteMessage = (id) => onMessageDelete?.(id);
   return /* @__PURE__ */ React2.createElement(Thread, {
     onClickCapture: onAttend,
     onFocusCapture: onAttend,
     current,
-    id: thread.id
+    id: fullyQualifiedId(thread)
   }, /* @__PURE__ */ React2.createElement("div", {
     role: "none",
     className: mx("col-span-2 grid grid-cols-[var(--rail-size)_1fr_min-content]", hoverableControls, hoverableFocusedWithinControls)
@@ -201,7 +196,7 @@ var CommentContainer = ({ thread, detached, context, current, autoFocusTextbox,
     key: message.id,
     message,
     members,
-    onDelete: handleDeleteMessage
+    onDelete: (id) => onMessageDelete?.(id)
   })), /* @__PURE__ */ React2.createElement(MessageTextbox, {
     extensions,
     autoFocus,
@@ -217,10 +212,11 @@ var CommentContainer = ({ thread, detached, context, current, autoFocusTextbox,
 };
 
 // packages/plugins/plugin-thread/src/components/CommentsContainer.tsx
-import { ChatText, Quotes } from "@phosphor-icons/react";
+import { ChatText } from "@phosphor-icons/react";
 import React3, { useEffect as useEffect2 } from "react";
-import { useTranslation as useTranslation3, Trans } from "@dxos/react-ui";
-import { PlankHeading, plankHeadingIconProps } from "@dxos/react-ui-deck";
+import { fullyQualifiedId as fullyQualifiedId2 } from "@dxos/react-client/echo";
+import { useTranslation as useTranslation3, Icon, Trans } from "@dxos/react-ui";
+import { PlankHeading } from "@dxos/react-ui-deck";
 import { descriptionText, mx as mx2 } from "@dxos/react-ui-theme";
 var CommentsHeading = ({ attendableId }) => {
   const { t } = useTranslation3(THREAD_PLUGIN);
@@ -229,7 +225,10 @@ var CommentsHeading = ({ attendableId }) => {
     className: "flex items-center"
   }, /* @__PURE__ */ React3.createElement(PlankHeading.Button, {
     attendableId
-  }, /* @__PURE__ */ React3.createElement(Quotes, plankHeadingIconProps)), /* @__PURE__ */ React3.createElement(PlankHeading.Label, {
+  }, /* @__PURE__ */ React3.createElement(Icon, {
+    icon: "ph--quotes--regular",
+    size: 5
+  })), /* @__PURE__ */ React3.createElement(PlankHeading.Label, {
     attendableId
   }, t("comments heading")));
 };
@@ -246,26 +245,29 @@ var CommentsContainer = ({ threads, detached = [], currentId, autoFocusCurrentTe
   }, [
     currentId
   ]);
-  return /* @__PURE__ */ React3.createElement(React3.Fragment, null, filteredThreads.length > 0 ? filteredThreads.map((thread) => /* @__PURE__ */ React3.createElement(CommentContainer, {
-    key: thread.id,
-    thread,
-    current: currentId === thread.id,
-    detached: detached.includes(thread.id),
-    autoFocusTextbox: autoFocusCurrentTextbox && currentId === thread.id,
-    ...onThreadAttend && {
-      onAttend: () => onThreadAttend(thread)
-    },
-    ...onThreadDelete && {
-      onThreadDelete: () => onThreadDelete(thread)
-    },
-    ...onMessageDelete && {
-      onMessageDelete: (messageId) => onMessageDelete(thread, messageId)
-    },
-    ...onThreadToggleResolved && {
-      onResolve: () => onThreadToggleResolved(thread)
-    },
-    ...props
-  })) : /* @__PURE__ */ React3.createElement("div", {
+  return /* @__PURE__ */ React3.createElement(React3.Fragment, null, filteredThreads.length > 0 ? filteredThreads.map((thread) => {
+    const threadId = fullyQualifiedId2(thread);
+    return /* @__PURE__ */ React3.createElement(CommentContainer, {
+      key: threadId,
+      thread,
+      current: currentId === threadId,
+      detached: detached.includes(threadId),
+      autoFocusTextbox: autoFocusCurrentTextbox && currentId === threadId,
+      ...onThreadAttend && {
+        onAttend: () => onThreadAttend(thread)
+      },
+      ...onThreadDelete && {
+        onThreadDelete: () => onThreadDelete(thread)
+      },
+      ...onMessageDelete && {
+        onMessageDelete: (messageId) => onMessageDelete(thread, messageId)
+      },
+      ...onThreadToggleResolved && {
+        onResolve: () => onThreadToggleResolved(thread)
+      },
+      ...props
+    });
+  }) : /* @__PURE__ */ React3.createElement("div", {
     role: "alert",
     className: mx2(descriptionText, "place-self-center border border-dashed border-neutral-400/50 rounded-lg text-center p-4 m-4")
   }, /* @__PURE__ */ React3.createElement("h2", {
@@ -282,8 +284,124 @@ var CommentsContainer = ({ threads, detached = [], currentId, autoFocusCurrentTe
 };
 
 // packages/plugins/plugin-thread/src/components/index.ts
-var ThreadMain = React4.lazy(() => import("./ThreadMain-ZDCRC6RG.mjs"));
-var ThreadArticle = React4.lazy(() => import("./ThreadArticle-O64ZECMF.mjs"));
+var ThreadMain = React4.lazy(() => import("./ThreadMain-ML3P4XSD.mjs"));
+var ThreadArticle = React4.lazy(() => import("./ThreadArticle-4VU752F4.mjs"));
+
+// packages/plugins/plugin-thread/src/components/ThreadComplementary.tsx
+import React5, { useEffect as useEffect3, useMemo as useMemo2 } from "react";
+import { LayoutAction, useIntentDispatcher, useResolvePlugins } from "@dxos/app-framework";
+import { fullyQualifiedId as fullyQualifiedId3 } from "@dxos/react-client/echo";
+import { ScrollArea } from "@dxos/react-ui";
+import { createAttendableAttributes, useAttentionContext } from "@dxos/react-ui-attention";
+import { nonNullable as nonNullable2 } from "@dxos/util";
+var providesThreadsConfig = (plugin) => "thread" in plugin.provides ? plugin : void 0;
+var ThreadComplementary = ({ role, subject, stagedThreads, current, focus, showResolvedThreads }) => {
+  const dispatch = useIntentDispatcher();
+  const threadsIntegrators = useResolvePlugins(providesThreadsConfig);
+  const threadProvides = useMemo2(() => threadsIntegrators.map((p) => p.provides.thread), [
+    threadsIntegrators
+  ]);
+  const createSort = useMemo2(() => threadProvides.find((p) => p.predicate(subject))?.createSort, [
+    threadProvides,
+    subject
+  ]);
+  const sort = useMemo2(() => createSort?.(subject), [
+    createSort,
+    subject
+  ]);
+  const threads = useMemo2(() => {
+    return subject.threads.concat(stagedThreads ?? []).filter(nonNullable2);
+  }, [
+    JSON.stringify(subject.threads),
+    JSON.stringify(stagedThreads)
+  ]);
+  const detachedIds = useMemo2(() => {
+    return threads.filter(({ anchor }) => !anchor).map((thread) => fullyQualifiedId3(thread));
+  }, [
+    threads
+  ]);
+  useEffect3(() => {
+    if (!sort) {
+      return;
+    }
+    threads.sort((a, b) => sort(a?.anchor, b?.anchor));
+  }, [
+    sort,
+    threads
+  ]);
+  const { attended } = useAttentionContext("Thread Complementary");
+  const qualifiedSubjectId = fullyQualifiedId3(subject);
+  const attendableAttrs = createAttendableAttributes(qualifiedSubjectId);
+  return /* @__PURE__ */ React5.createElement("div", {
+    role: "none",
+    className: "contents group/attention",
+    ...attendableAttrs
+  }, role === "complementary" && /* @__PURE__ */ React5.createElement(CommentsHeading, {
+    attendableId: qualifiedSubjectId
+  }), /* @__PURE__ */ React5.createElement(ScrollArea.Root, {
+    classNames: "row-span-2"
+  }, /* @__PURE__ */ React5.createElement(ScrollArea.Viewport, null, /* @__PURE__ */ React5.createElement(CommentsContainer, {
+    threads,
+    detached: detachedIds,
+    currentId: attended.has(qualifiedSubjectId) ? current : void 0,
+    autoFocusCurrentTextbox: focus,
+    showResolvedThreads,
+    onThreadAttend: (thread) => {
+      const threadId = fullyQualifiedId3(thread);
+      if (current !== threadId) {
+        current = threadId;
+        void dispatch?.([
+          {
+            action: LayoutAction.SCROLL_INTO_VIEW,
+            data: {
+              id: fullyQualifiedId3(subject),
+              thread: threadId,
+              cursor: thread.anchor
+            }
+          }
+        ]);
+      }
+    },
+    onThreadDelete: (thread) => {
+      return dispatch({
+        plugin: THREAD_PLUGIN,
+        action: ThreadAction.DELETE,
+        data: {
+          subject,
+          thread
+        }
+      });
+    },
+    onMessageDelete: (thread, messageId) => dispatch({
+      plugin: THREAD_PLUGIN,
+      action: ThreadAction.DELETE_MESSAGE,
+      data: {
+        subject,
+        thread,
+        messageId
+      }
+    }),
+    onThreadToggleResolved: (thread) => dispatch({
+      plugin: THREAD_PLUGIN,
+      action: ThreadAction.TOGGLE_RESOLVED,
+      data: {
+        thread
+      }
+    }),
+    onComment: (thread) => {
+      void dispatch({
+        action: ThreadAction.ON_MESSAGE_ADD,
+        data: {
+          thread,
+          subject
+        }
+      });
+    }
+  }), /* @__PURE__ */ React5.createElement("div", {
+    role: "none",
+    className: "bs-10"
+  }), /* @__PURE__ */ React5.createElement(ScrollArea.Scrollbar, null, /* @__PURE__ */ React5.createElement(ScrollArea.Thumb, null)))));
+};
 
 // packages/plugins/plugin-thread/src/translations.ts
 var translations_default = [
@@ -322,6 +440,7 @@ var translations_default = [
 ];
 
 // packages/plugins/plugin-thread/src/ThreadPlugin.tsx
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/plugins/plugin-thread/src/ThreadPlugin.tsx";
 var initialViewState = {
   showResolvedThreads: false
 };
@@ -339,10 +458,8 @@ var ThreadPlugin = () => {
     }
     return viewStore[subjectId];
   };
-  let attentionPlugin;
   let navigationPlugin;
   let intentPlugin;
-  let dispatch;
   const unsubscribeCallbacks = [];
   return {
     meta: meta_default,
@@ -353,36 +470,8 @@ var ThreadPlugin = () => {
           allowUndefined: true
         })
       });
-      attentionPlugin = resolvePlugin(plugins, parseAttentionPlugin);
       navigationPlugin = resolvePlugin(plugins, parseNavigationPlugin);
       intentPlugin = resolvePlugin(plugins, parseIntentPlugin);
-      dispatch = intentPlugin?.provides.intent.dispatch;
-      const graphPlugin = resolvePlugin(plugins, parseGraphPlugin);
-      const client = resolvePlugin(plugins, parseClientPlugin)?.provides.client;
-      if (!client) {
-        return;
-      }
-      const channelsQuery = client.spaces.query(Filter.schema(ChannelType));
-      const queryUnsubscribe = channelsQuery.subscribe();
-      const unsubscribe = effect(() => {
-        const attention = attentionPlugin?.provides.attention;
-        if (!attention?.attended) {
-          return;
-        }
-        const firstAttendedNodeWithComments = Array.from(attention.attended).map((id) => graphPlugin?.provides.graph.findNode(id)).find((node) => node?.data instanceof DocumentType && (node.data.threads?.length ?? 0) > 0);
-        if (firstAttendedNodeWithComments) {
-          void intentPlugin?.provides.intent.dispatch({
-            action: NavigationAction.OPEN,
-            data: {
-              activeParts: {
-                complementary: `${firstAttendedNodeWithComments.id}${SLUG_PATH_SEPARATOR}comments`
-              }
-            }
-          });
-        }
-      });
-      unsubscribeCallbacks.push(queryUnsubscribe);
-      unsubscribeCallbacks.push(unsubscribe);
     },
     unload: async () => {
       unsubscribeCallbacks.forEach((unsubscribe) => unsubscribe());
@@ -398,8 +487,7 @@ var ThreadPlugin = () => {
                 ns: THREAD_PLUGIN
               }
             ],
-            icon: (props) => /* @__PURE__ */ React5.createElement(Chat, props),
-            iconSymbol: "ph--chat--regular",
+            icon: "ph--chat--regular",
             // TODO(wittjosiah): Move out of metadata.
             loadReferences: (channel) => loadObjectReferences(channel, (channel2) => channel2.threads)
           },
@@ -446,9 +534,9 @@ var ThreadPlugin = () => {
       graph: {
         builder: (plugins) => {
           const client = resolvePlugin(plugins, parseClientPlugin)?.provides.client;
-          const dispatch2 = resolvePlugin(plugins, parseIntentPlugin)?.provides.intent.dispatch;
+          const dispatch = resolvePlugin(plugins, parseIntentPlugin)?.provides.intent.dispatch;
           const metadataResolver = resolvePlugin(plugins, parseMetadataResolverPlugin)?.provides.metadata.resolver;
-          if (!client || !dispatch2 || !metadataResolver) {
+          if (!client || !dispatch || !metadataResolver) {
             return [];
           }
           return [
@@ -458,27 +546,33 @@ var ThreadPlugin = () => {
                 if (!id.endsWith("~comments")) {
                   return;
                 }
-                const docId = id.split("~").at(0);
-                const [spaceId, objectId] = docId?.split(":") ?? [];
+                const subjectId = id.split("~").at(0);
+                const [spaceId, objectId] = subjectId?.split(":") ?? [];
                 const space = client.spaces.get().find((space2) => space2.id === spaceId);
-                const doc = space?.db.getObjectById(objectId);
-                if (!doc || !docId) {
+                const object = toSignal((onChange) => {
+                  const timeout = setTimeout(async () => {
+                    await space?.db.loadObjectById(objectId);
+                    onChange();
+                  });
+                  return () => clearTimeout(timeout);
+                }, () => space?.db.getObjectById(objectId));
+                if (!object || !subjectId) {
                   return;
                 }
-                const docMeta = metadataResolver(getTypename(doc) ?? "");
-                const label = docMeta.label?.(doc) || doc.name || docMeta.placeholder || [
+                const meta = metadataResolver(getTypename(object) ?? "");
+                const label = meta.label?.(object) || object.name || meta.placeholder || [
                   "unnamed object threads label",
                   {
                     ns: THREAD_PLUGIN
                   }
                 ];
-                const viewState = getViewState(docId);
+                const viewState = getViewState(subjectId);
                 return {
                   id,
                   type: "orphan-comments-for-subject",
-                  data: doc,
+                  data: object,
                   properties: {
-                    icon: meta_default.iconComponent,
+                    icon: meta.icon,
                     label,
                     showResolvedThreads: viewState.showResolvedThreads
                   }
@@ -494,7 +588,7 @@ var ThreadPlugin = () => {
                 const toggle = () => {
                   const newToggleState = !viewState.showResolvedThreads;
                   viewState.showResolvedThreads = newToggleState;
-                  void dispatch2({
+                  void dispatch({
                     action: ObservabilityAction.SEND_EVENT,
                     data: {
                       name: "threads.toggle-show-resolved",
@@ -519,7 +613,8 @@ var ThreadPlugin = () => {
                       ],
                       menuItemType: "toggle",
                       isChecked: viewState.showResolvedThreads,
-                      testId: "threadPlugin.toggleShowResolved"
+                      testId: "threadPlugin.toggleShowResolved",
+                      icon: viewState.showResolvedThreads ? "ph--eye-slash--regular" : "ph--eye--regular"
                     }
                   }
                 ];
@@ -541,7 +636,7 @@ var ThreadPlugin = () => {
                   {
                     id: `${THREAD_PLUGIN}/create/${node.id}`,
                     data: async () => {
-                      await dispatch2([
+                      await dispatch([
                         {
                           plugin: THREAD_PLUGIN,
                           action: ThreadAction.CREATE
@@ -564,8 +659,7 @@ var ThreadPlugin = () => {
                           ns: THREAD_PLUGIN
                         }
                       ],
-                      icon: (props) => /* @__PURE__ */ React5.createElement(Chat, props),
-                      iconSymbol: "ph--chat--regular",
+                      icon: "ph--chat--regular",
                       testId: "threadPlugin.createObject"
                     }
                   }
@@ -579,24 +673,18 @@ var ThreadPlugin = () => {
         component: ({ data, role }) => {
           switch (role) {
             case "main": {
-              return data.active instanceof ChannelType && data.active.threads[0] ? /* @__PURE__ */ React5.createElement(ThreadMain, {
+              return data.active instanceof ChannelType && data.active.threads[0] ? /* @__PURE__ */ React6.createElement(ThreadMain, {
                 thread: data.active.threads[0]
               }) : null;
             }
             case "settings": {
-              return data.plugin === meta_default.id ? /* @__PURE__ */ React5.createElement(ThreadSettings, {
+              return data.plugin === meta_default.id ? /* @__PURE__ */ React6.createElement(ThreadSettings, {
                 settings: settings.values
               }) : null;
             }
             case "article":
             case "complementary": {
               const location = navigationPlugin?.provides.location;
-              const providesThreadsConfig = useCallback2((plugin) => (
-                // TODO(Zan): More robust runtime check.
-                "thread" in plugin.provides ? plugin : void 0
-              ), []);
-              const threadsIntegrators = useResolvePlugins(providesThreadsConfig);
-              const threadProvides = threadsIntegrators.map((p) => p.provides.thread);
               if (data.object instanceof ChannelType && data.object.threads[0]) {
                 const channel = data.object;
                 if (isLayoutParts(location?.active) && location.active.main) {
@@ -605,101 +693,33 @@ var ThreadPlugin = () => {
                   if (currentPosition > 0) {
                     const objectToTheLeft = layoutEntries[currentPosition - 1];
                     const context = getSpace2(data.object)?.db.getObjectById(objectToTheLeft.id);
-                    return /* @__PURE__ */ React5.createElement(ThreadArticle, {
+                    return /* @__PURE__ */ React6.createElement(ThreadArticle, {
                       thread: data.object.threads[0],
                       context
                     });
                   }
                 }
-                return /* @__PURE__ */ React5.createElement(ThreadArticle, {
+                return /* @__PURE__ */ React6.createElement(ThreadArticle, {
                   thread: data.object.threads[0]
                 });
               }
               if (data.subject instanceof ThreadType) {
-                return /* @__PURE__ */ React5.createElement(React5.Fragment, null, /* @__PURE__ */ React5.createElement(ChatHeading, {
+                return /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(ChatHeading, {
                   attendableId: data.subject.id
-                }), /* @__PURE__ */ React5.createElement(ChatContainer, {
+                }), /* @__PURE__ */ React6.createElement(ChatContainer, {
                   thread: data.subject
                 }));
               }
               if (data.subject && typeof data.subject === "object" && "threads" in data.subject && Array.isArray(data.subject.threads)) {
-                const threads = data.subject.threads.concat(state.staging[fullyQualifiedId(data.subject)]).filter(nonNullable2);
-                const createSort = threadProvides.find((p) => p.predicate(data.subject))?.createSort;
-                if (createSort) {
-                  const sort = createSort(data.subject);
-                  threads.sort((a, b) => sort(a.anchor, b.anchor));
-                }
-                const detached = data.subject.threads.filter(nonNullable2).filter(({ anchor }) => !anchor).map((thread) => thread.id);
-                const qualifiedSubjectId = fullyQualifiedId(data.subject);
-                const attention = attentionPlugin?.provides.attention?.attended ?? /* @__PURE__ */ new Set([
-                  qualifiedSubjectId
-                ]);
-                const attendableAttrs = createAttendableAttributes(qualifiedSubjectId);
-                const { showResolvedThreads } = getViewState(qualifiedSubjectId);
-                return /* @__PURE__ */ React5.createElement("div", {
-                  role: "none",
-                  className: "contents group/attention",
-                  ...attendableAttrs
-                }, role === "complementary" && /* @__PURE__ */ React5.createElement(CommentsHeading, {
-                  attendableId: qualifiedSubjectId
-                }), /* @__PURE__ */ React5.createElement(ScrollArea.Root, {
-                  classNames: "row-span-2"
-                }, /* @__PURE__ */ React5.createElement(ScrollArea.Viewport, null, /* @__PURE__ */ React5.createElement(CommentsContainer, {
-                  threads,
-                  detached,
-                  currentId: attention.has(qualifiedSubjectId) ? state.current : void 0,
-                  autoFocusCurrentTextbox: state.focus,
-                  showResolvedThreads,
-                  onThreadAttend: (thread) => {
-                    if (state.current !== thread.id) {
-                      state.current = thread.id;
-                      void dispatch?.({
-                        action: LayoutAction.SCROLL_INTO_VIEW,
-                        data: {
-                          id: fullyQualifiedId(data.subject),
-                          thread: fullyQualifiedId(thread),
-                          cursor: thread.anchor
-                        }
-                      });
-                    }
-                  },
-                  onThreadDelete: (thread) => dispatch?.({
-                    plugin: THREAD_PLUGIN,
-                    action: ThreadAction.DELETE,
-                    data: {
-                      subject: data.subject,
-                      thread
-                    }
-                  }),
-                  onMessageDelete: (thread, messageId) => dispatch?.({
-                    plugin: THREAD_PLUGIN,
-                    action: ThreadAction.DELETE_MESSAGE,
-                    data: {
-                      subject: data.subject,
-                      thread,
-                      messageId
-                    }
-                  }),
-                  onThreadToggleResolved: (thread) => dispatch?.({
-                    plugin: THREAD_PLUGIN,
-                    action: ThreadAction.TOGGLE_RESOLVED,
-                    data: {
-                      thread
-                    }
-                  }),
-                  onComment: (thread) => {
-                    void intentPlugin?.provides.intent.dispatch({
-                      action: ThreadAction.ON_MESSAGE_ADD,
-                      data: {
-                        thread,
-                        subject: data.subject
-                      }
-                    });
-                  }
-                }), /* @__PURE__ */ React5.createElement("div", {
-                  role: "none",
-                  className: "bs-10"
-                }), /* @__PURE__ */ React5.createElement(ScrollArea.Scrollbar, null, /* @__PURE__ */ React5.createElement(ScrollArea.Thumb, null)))));
+                const { showResolvedThreads } = getViewState(fullyQualifiedId4(data.subject));
+                return /* @__PURE__ */ React6.createElement(ThreadComplementary, {
+                  role,
+                  subject: data.subject,
+                  stagedThreads: state.staging[fullyQualifiedId4(data.subject)],
+                  current: state.current,
+                  focus: true,
+                  showResolvedThreads
+                });
               }
             }
           }
@@ -712,7 +732,20 @@ var ThreadPlugin = () => {
             case ThreadAction.CREATE: {
               if (intent.data && intent.data.cursor !== void 0) {
                 const { cursor, name, subject } = intent.data;
-                const subjectId = fullyQualifiedId(subject);
+                if (subject?.threads === void 0) {
+                  try {
+                    subject.threads = [];
+                  } catch (e) {
+                    log.error("Subject does not support threads array", subject?.typename, {
+                      F: __dxlog_file,
+                      L: 331,
+                      S: void 0,
+                      C: (f, a) => f(...a)
+                    });
+                    return;
+                  }
+                }
+                const subjectId = fullyQualifiedId4(subject);
                 const thread = create2(ThreadType, {
                   name,
                   anchor: cursor,
@@ -731,23 +764,15 @@ var ThreadPlugin = () => {
                   data: thread,
                   intents: [
                     [
-                      {
-                        action: NavigationAction.OPEN,
-                        data: {
-                          activeParts: {
-                            complementary: `${subjectId}${SLUG_PATH_SEPARATOR}comments${SLUG_COLLECTION_INDICATOR}`
-                          }
-                        }
-                      },
                       {
                         action: ThreadAction.SELECT,
                         data: {
-                          current: thread.id,
+                          current: fullyQualifiedId4(thread),
                           focus: true
                         }
                       },
                       {
-                        action: LayoutAction.SET_LAYOUT,
+                        action: LayoutAction2.SET_LAYOUT,
                         data: {
                           element: "complementary",
                           subject: subjectId,
@@ -807,16 +832,18 @@ var ThreadPlugin = () => {
             }
             case ThreadAction.DELETE: {
               const { subject, thread } = intent.data ?? {};
-              if (!(subject instanceof DocumentType) || !(thread instanceof ThreadType)) {
+              if (!(thread instanceof ThreadType) || !(subject && typeof subject === "object" && "threads" in subject)) {
                 return;
               }
-              const subjectId = fullyQualifiedId(subject);
+              const subjectId = fullyQualifiedId4(subject);
               const stagingArea = state.staging[subjectId];
               if (stagingArea) {
                 const index = stagingArea.findIndex((t) => t.id === thread.id);
                 if (index !== -1) {
                   stagingArea.splice(index, 1);
-                  return;
+                  return {
+                    data: true
+                  };
                 }
               }
               const space = getSpace2(thread);
@@ -877,10 +904,10 @@ var ThreadPlugin = () => {
             }
             case ThreadAction.ON_MESSAGE_ADD: {
               const { thread, subject } = intent.data ?? {};
-              if (!(thread instanceof ThreadType) || !(subject && typeof subject === "object" && "threads" in subject)) {
+              if (!(thread instanceof ThreadType) || !(subject && typeof subject === "object" && "threads" in subject && Array.isArray(subject.threads))) {
                 return;
               }
-              const subjectId = fullyQualifiedId(subject);
+              const subjectId = fullyQualifiedId4(subject);
               const space = getSpace2(subject);
               const intents = [];
               const analyticsProperties = {
@@ -921,7 +948,7 @@ var ThreadPlugin = () => {
             case ThreadAction.DELETE_MESSAGE: {
               const { subject, thread, messageId } = intent.data ?? {};
               const space = getSpace2(subject);
-              if (!(subject instanceof DocumentType) || !(thread instanceof ThreadType) || !space) {
+              if (!(thread instanceof ThreadType) || !(subject && typeof subject === "object" && "threads" in subject)) {
                 return;
               }
               if (!intent.undo) {
@@ -963,7 +990,7 @@ var ThreadPlugin = () => {
                           name: "threads.message.delete",
                           properties: {
                             threadId: thread.id,
-                            spaceId: space.id
+                            spaceId: space?.id
                           }
                         }
                       }
@@ -987,7 +1014,7 @@ var ThreadPlugin = () => {
                           name: "threads.message.undo-delete",
                           properties: {
                             threadId: thread.id,
-                            spaceId: space.id
+                            spaceId: space?.id
                           }
                         }
                       }
@@ -1009,8 +1036,8 @@ var ThreadPlugin = () => {
             ];
           }
           const threads = computed(() => [
-            ...doc.threads.filter(nonNullable2),
-            ...state.staging[fullyQualifiedId(doc)] ?? []
+            ...doc.threads.filter(nonNullable3),
+            ...state.staging[fullyQualifiedId4(doc)] ?? []
           ].filter((thread) => !(thread?.status === "resolved")));
           return [
             listener2({
@@ -1029,7 +1056,7 @@ var ThreadPlugin = () => {
               }
             }),
             createExternalCommentSync(doc.id, (sink) => effect(() => sink()), () => threads.value.filter((thread) => thread?.anchor).map((thread) => ({
-              id: thread.id,
+              id: fullyQualifiedId4(thread),
               cursor: thread.anchor
             }))),
             comments({
@@ -1049,9 +1076,9 @@ var ThreadPlugin = () => {
                 });
               },
               onDelete: ({ id }) => {
-                const stagingArea = state.staging[fullyQualifiedId(doc)];
+                const stagingArea = state.staging[fullyQualifiedId4(doc)];
                 if (stagingArea) {
-                  const index = stagingArea.findIndex((thread2) => thread2.id === id);
+                  const index = stagingArea.findIndex((thread2) => fullyQualifiedId4(thread2) === id);
                   if (index !== -1) {
                     stagingArea.splice(index, 1);
                   }
@@ -1062,7 +1089,7 @@ var ThreadPlugin = () => {
                 }
               },
               onUpdate: ({ id, cursor }) => {
-                const thread = state.staging[fullyQualifiedId(doc)]?.find((thread2) => thread2.id === id) ?? doc.threads.find((thread2) => thread2?.id === id);
+                const thread = state.staging[fullyQualifiedId4(doc)]?.find((thread2) => fullyQualifiedId4(thread2) === id) ?? doc.threads.find((thread2) => thread2?.id === id);
                 if (thread instanceof ThreadType && thread.anchor) {
                   const [start, end] = thread.anchor.split(":");
                   thread.name = doc.content && getTextInRange(createDocAccessor(doc.content, [
@@ -1072,9 +1099,9 @@ var ThreadPlugin = () => {
                 }
               },
               onSelect: ({ selection: { current, closest } }) => {
-                const dispatch2 = intentPlugin?.provides.intent.dispatch;
-                if (dispatch2) {
-                  void dispatch2([
+                const dispatch = intentPlugin?.provides.intent.dispatch;
+                if (dispatch) {
+                  void dispatch([
                     {
                       action: ThreadAction.SELECT,
                       data: {