@dxos/plugin-thread 0.6.12-staging.e11e696 → 0.6.13-main.041e8aa

package/dist/lib/node-esm/index.mjs

@@ -1,7 +1,7 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 import {
   ThreadAction
-} from "./chunk-YO46JGAE.mjs";
+} from "./chunk-ZXIPFXSA.mjs";
 import {
   ChatContainer,
   ChatHeading,
@@ -11,67 +11,49 @@ import {
   useAnalyticsCallback,
   useOnEditAnalytics,
   useStatus
-} from "./chunk-A44C4MTQ.mjs";
+} from "./chunk-XOVJ65DG.mjs";
 import {
   THREAD_ITEM,
   THREAD_PLUGIN,
   meta_default
-} from "./chunk-Y475KZTX.mjs";
+} from "./chunk-DC5ZA6H5.mjs";
 
 // packages/plugins/plugin-thread/src/ThreadPlugin.tsx
-import { computed, effect } from "@preact/signals-core";
 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 { NavigationAction, isLayoutParts, parseIntentPlugin, parseNavigationPlugin, parseMetadataResolverPlugin, resolvePlugin } from "@dxos/app-framework";
+import { create as create2, getTypename } from "@dxos/echo-schema";
 import { LocalStorageStore } from "@dxos/local-storage";
 import { log } from "@dxos/log";
 import { parseClientPlugin } from "@dxos/plugin-client";
 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, createDocAccessor, fullyQualifiedId as fullyQualifiedId4, loadObjectReferences } from "@dxos/react-client/echo";
-import { comments, createExternalCommentSync, listener as listener2 } from "@dxos/react-ui-editor";
+import { ThreadType as ThreadType2, MessageType as MessageType2, ChannelType } from "@dxos/plugin-space/types";
+import { getSpace as getSpace3, fullyQualifiedId as fullyQualifiedId5, loadObjectReferences, parseFullyQualifiedId } from "@dxos/react-client/echo";
 import { translations as threadTranslations } from "@dxos/react-ui-thread";
-import { nonNullable as nonNullable3 } from "@dxos/util";
 
 // packages/plugins/plugin-thread/src/components/index.ts
-import React4 from "react";
-
-// packages/plugins/plugin-thread/src/components/ThreadSettings.tsx
-import React from "react";
-import { SettingsValue } from "@dxos/plugin-settings";
-import { Input, useTranslation } from "@dxos/react-ui";
-var ThreadSettings = ({ settings }) => {
-  const { t } = useTranslation(THREAD_PLUGIN);
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(SettingsValue, {
-    label: t("settings standalone label")
-  }, /* @__PURE__ */ React.createElement(Input.Switch, {
-    checked: settings.standalone,
-    onCheckedChange: (checked) => settings.standalone = !!checked
-  })));
-};
+import React5 from "react";
 
 // packages/plugins/plugin-thread/src/components/CommentContainer.tsx
 import { CheckCircle, X } from "@phosphor-icons/react";
-import React2, { useCallback, useMemo, useRef, useState } from "react";
+import React, { useCallback, useMemo, useRef, useState } from "react";
 import { create } from "@dxos/echo-schema";
 import { MessageType } from "@dxos/plugin-space/types";
 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 { Button, Tag, Tooltip, useThemeContext, useTranslation } from "@dxos/react-ui";
 import { createBasicExtensions, createThemeExtensions, listener } from "@dxos/react-ui-editor";
 import { getSize, hoverableControlItem, hoverableControls, hoverableFocusedWithinControls, mx } from "@dxos/react-ui-theme";
 import { MessageTextbox, Thread, ThreadFooter, ThreadHeading } from "@dxos/react-ui-thread";
 import { nonNullable } from "@dxos/util";
 var sizeClass = getSize(4);
 var ToggleResolvedButton = ({ isResolved, onResolve }) => {
-  const { t } = useTranslation2(THREAD_PLUGIN);
+  const { t } = useTranslation(THREAD_PLUGIN);
   const label = t(isResolved ? "mark as unresolved label" : "mark as resolved label");
-  return /* @__PURE__ */ React2.createElement(Tooltip.Root, null, /* @__PURE__ */ React2.createElement(Tooltip.Trigger, {
+  return /* @__PURE__ */ React.createElement(Tooltip.Root, null, /* @__PURE__ */ React.createElement(Tooltip.Trigger, {
     asChild: true
-  }, /* @__PURE__ */ React2.createElement(Button, {
+  }, /* @__PURE__ */ React.createElement(Button, {
     variant: "ghost",
     "data-testid": "thread.toggle-resolved",
     onClick: onResolve,
@@ -79,23 +61,23 @@ var ToggleResolvedButton = ({ isResolved, onResolve }) => {
       "min-bs-0 p-1",
       !isResolved && hoverableControlItem
     ]
-  }, /* @__PURE__ */ React2.createElement("span", {
+  }, /* @__PURE__ */ React.createElement("span", {
     className: "sr-only"
-  }, label), isResolved ? /* @__PURE__ */ React2.createElement(CheckCircle, {
+  }, label), isResolved ? /* @__PURE__ */ React.createElement(CheckCircle, {
     className: sizeClass,
     weight: "fill"
-  }) : /* @__PURE__ */ React2.createElement(CheckCircle, {
+  }) : /* @__PURE__ */ React.createElement(CheckCircle, {
     className: sizeClass
-  }))), /* @__PURE__ */ React2.createElement(Tooltip.Portal, null, /* @__PURE__ */ React2.createElement(Tooltip.Content, {
+  }))), /* @__PURE__ */ React.createElement(Tooltip.Portal, null, /* @__PURE__ */ React.createElement(Tooltip.Content, {
     classNames: "z-[21]"
-  }, label, /* @__PURE__ */ React2.createElement(Tooltip.Arrow, null))));
+  }, label, /* @__PURE__ */ React.createElement(Tooltip.Arrow, null))));
 };
 var DeleteThreadButton = ({ onDelete }) => {
-  const { t } = useTranslation2(THREAD_PLUGIN);
+  const { t } = useTranslation(THREAD_PLUGIN);
   const label = t("delete thread label");
-  return /* @__PURE__ */ React2.createElement(Tooltip.Root, null, /* @__PURE__ */ React2.createElement(Tooltip.Trigger, {
+  return /* @__PURE__ */ React.createElement(Tooltip.Root, null, /* @__PURE__ */ React.createElement(Tooltip.Trigger, {
     asChild: true
-  }, /* @__PURE__ */ React2.createElement(Button, {
+  }, /* @__PURE__ */ React.createElement(Button, {
     variant: "ghost",
     "data-testid": "thread.delete",
     onClick: onDelete,
@@ -103,20 +85,20 @@ var DeleteThreadButton = ({ onDelete }) => {
       "min-bs-0 p-1",
       hoverableControlItem
     ]
-  }, /* @__PURE__ */ React2.createElement("span", {
+  }, /* @__PURE__ */ React.createElement("span", {
     className: "sr-only"
-  }, label), /* @__PURE__ */ React2.createElement(X, {
+  }, label), /* @__PURE__ */ React.createElement(X, {
     className: sizeClass
-  }))), /* @__PURE__ */ React2.createElement(Tooltip.Portal, null, /* @__PURE__ */ React2.createElement(Tooltip.Content, {
+  }))), /* @__PURE__ */ React.createElement(Tooltip.Portal, null, /* @__PURE__ */ React.createElement(Tooltip.Content, {
     classNames: "z-[21]"
-  }, label, /* @__PURE__ */ React2.createElement(Tooltip.Arrow, null))));
+  }, label, /* @__PURE__ */ React.createElement(Tooltip.Arrow, null))));
 };
 var CommentContainer = ({ thread, detached, context, current, onAttend, onThreadDelete, onMessageDelete, onResolve, onComment }) => {
   const identity = useIdentity();
   const space = getSpace(thread);
   const members = useMembers(space?.key);
   const activity = useStatus(space, fullyQualifiedId(thread));
-  const { t } = useTranslation2(THREAD_PLUGIN);
+  const { t } = useTranslation(THREAD_PLUGIN);
   const threadScrollRef = useRef(null);
   const { themeMode } = useThemeContext();
   const textboxMetadata = getMessageMetadata(fullyQualifiedId(thread), identity);
@@ -162,42 +144,42 @@ var CommentContainer = ({ thread, detached, context, current, onAttend, onThread
     thread,
     identity
   ]);
-  return /* @__PURE__ */ React2.createElement(Thread, {
+  return /* @__PURE__ */ React.createElement(Thread, {
     onClickCapture: onAttend,
     onFocusCapture: onAttend,
     current,
     id: fullyQualifiedId(thread)
-  }, /* @__PURE__ */ React2.createElement("div", {
+  }, /* @__PURE__ */ React.createElement("div", {
     role: "none",
     className: mx("col-span-2 grid grid-cols-[var(--rail-size)_1fr_min-content]", hoverableControls, hoverableFocusedWithinControls)
-  }, detached ? /* @__PURE__ */ React2.createElement(Tooltip.Root, null, /* @__PURE__ */ React2.createElement(Tooltip.Trigger, {
+  }, detached ? /* @__PURE__ */ React.createElement(Tooltip.Root, null, /* @__PURE__ */ React.createElement(Tooltip.Trigger, {
     asChild: true
-  }, /* @__PURE__ */ React2.createElement(ThreadHeading, {
+  }, /* @__PURE__ */ React.createElement(ThreadHeading, {
     detached: true
-  }, thread.name ?? t("thread title placeholder"))), /* @__PURE__ */ React2.createElement(Tooltip.Portal, null, /* @__PURE__ */ React2.createElement(Tooltip.Content, {
+  }, thread.name ?? t("thread title placeholder"))), /* @__PURE__ */ React.createElement(Tooltip.Portal, null, /* @__PURE__ */ React.createElement(Tooltip.Content, {
     classNames: "z-[21]",
     side: "top"
-  }, t("detached thread label"), /* @__PURE__ */ React2.createElement(Tooltip.Arrow, null)))) : /* @__PURE__ */ React2.createElement(ThreadHeading, null, thread.name ?? t("thread title placeholder")), /* @__PURE__ */ React2.createElement("div", {
+  }, t("detached thread label"), /* @__PURE__ */ React.createElement(Tooltip.Arrow, null)))) : /* @__PURE__ */ React.createElement(ThreadHeading, null, thread.name ?? t("thread title placeholder")), /* @__PURE__ */ React.createElement("div", {
     className: "flex flex-row items-center pli-1"
-  }, thread.status === "staged" && /* @__PURE__ */ React2.createElement(Tag, {
+  }, thread.status === "staged" && /* @__PURE__ */ React.createElement(Tag, {
     palette: "neutral"
-  }, t("draft button")), onResolve && !(thread?.status === "staged") && /* @__PURE__ */ React2.createElement(ToggleResolvedButton, {
+  }, t("draft button")), onResolve && !(thread?.status === "staged") && /* @__PURE__ */ React.createElement(ToggleResolvedButton, {
     isResolved: thread?.status === "resolved",
     onResolve
-  }), onThreadDelete && /* @__PURE__ */ React2.createElement(DeleteThreadButton, {
+  }), onThreadDelete && /* @__PURE__ */ React.createElement(DeleteThreadButton, {
     onDelete: onThreadDelete
-  }))), thread.messages.filter(nonNullable).map((message) => /* @__PURE__ */ React2.createElement(MessageContainer, {
+  }))), thread.messages.filter(nonNullable).map((message) => /* @__PURE__ */ React.createElement(MessageContainer, {
     key: message.id,
     message,
     members,
     onDelete: (id) => onMessageDelete?.(id)
-  })), /* @__PURE__ */ React2.createElement(MessageTextbox, {
+  })), /* @__PURE__ */ React.createElement(MessageTextbox, {
     extensions,
     onSend: handleCreate,
     ...textboxMetadata
-  }), /* @__PURE__ */ React2.createElement(ThreadFooter, {
+  }), /* @__PURE__ */ React.createElement(ThreadFooter, {
     activity
-  }, t("activity message")), /* @__PURE__ */ React2.createElement("div", {
+  }, t("activity message")), /* @__PURE__ */ React.createElement("div", {
     role: "none",
     className: "bs-px -mbs-px",
     ref: threadScrollRef
@@ -206,13 +188,13 @@ var CommentContainer = ({ thread, detached, context, current, onAttend, onThread
 
 // packages/plugins/plugin-thread/src/components/CommentsContainer.tsx
 import { ChatText } from "@phosphor-icons/react";
-import React3, { useEffect } from "react";
+import React2, { useEffect } from "react";
 import { fullyQualifiedId as fullyQualifiedId2 } from "@dxos/react-client/echo";
-import { useTranslation as useTranslation3, Trans } from "@dxos/react-ui";
+import { useTranslation as useTranslation2, Trans } from "@dxos/react-ui";
 import { descriptionText, mx as mx2 } from "@dxos/react-ui-theme";
-var CommentsContainer = ({ threads, detached = [], currentId, showResolvedThreads, onThreadAttend, onThreadDelete, onMessageDelete, onThreadToggleResolved, ...props }) => {
-  const { t } = useTranslation3(THREAD_PLUGIN);
-  const filteredThreads = showResolvedThreads ? threads : threads.filter((thread) => !(thread?.status === "resolved"));
+var CommentsContainer = ({ threads: threads2, detached = [], currentId, showResolvedThreads, onThreadAttend, onThreadDelete, onMessageDelete, onThreadToggleResolved, ...props }) => {
+  const { t } = useTranslation2(THREAD_PLUGIN);
+  const filteredThreads = showResolvedThreads ? threads2 : threads2.filter((thread) => !(thread?.status === "resolved"));
   useEffect(() => {
     if (currentId) {
       document.getElementById(currentId)?.scrollIntoView({
@@ -223,9 +205,9 @@ var CommentsContainer = ({ threads, detached = [], currentId, showResolvedThread
   }, [
     currentId
   ]);
-  return /* @__PURE__ */ React3.createElement(React3.Fragment, null, filteredThreads.length > 0 ? filteredThreads.map((thread) => {
+  return /* @__PURE__ */ React2.createElement(React2.Fragment, null, filteredThreads.length > 0 ? filteredThreads.map((thread) => {
     const threadId = fullyQualifiedId2(thread);
-    return /* @__PURE__ */ React3.createElement(CommentContainer, {
+    return /* @__PURE__ */ React2.createElement(CommentContainer, {
       key: threadId,
       thread,
       current: currentId === threadId,
@@ -244,35 +226,31 @@ var CommentsContainer = ({ threads, detached = [], currentId, showResolvedThread
       },
       ...props
     });
-  }) : /* @__PURE__ */ React3.createElement("div", {
+  }) : /* @__PURE__ */ React2.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", {
+  }, /* @__PURE__ */ React2.createElement("h2", {
     className: "mbe-2 font-medium text-baseText"
-  }, t("no comments title")), /* @__PURE__ */ React3.createElement("p", null, /* @__PURE__ */ React3.createElement(Trans, {
+  }, t("no comments title")), /* @__PURE__ */ React2.createElement("p", null, /* @__PURE__ */ React2.createElement(Trans, {
     t,
     i18nKey: "no comments message",
     components: {
-      commentIcon: /* @__PURE__ */ React3.createElement(ChatText, {
+      commentIcon: /* @__PURE__ */ React2.createElement(ChatText, {
         className: "inline-block"
       })
     }
   }))));
 };
 
-// packages/plugins/plugin-thread/src/components/index.ts
-var ThreadMain = React4.lazy(() => import("./ThreadMain-2A3VQLCW.mjs"));
-var ThreadArticle = React4.lazy(() => import("./ThreadArticle-NKI5F4W5.mjs"));
-
 // packages/plugins/plugin-thread/src/components/ThreadComplementary.tsx
-import React5, { useEffect as useEffect2, useMemo as useMemo2 } from "react";
+import React3, { useEffect as useEffect2, 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 { useAttended } 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, showResolvedThreads }) => {
+var ThreadComplementary = ({ role, subject, drafts, current, showResolvedThreads }) => {
   const dispatch = useIntentDispatcher();
   const threadsIntegrators = useResolvePlugins(providesThreadsConfig);
   const threadProvides = useMemo2(() => threadsIntegrators.map((p) => p.provides.thread), [
@@ -286,35 +264,35 @@ var ThreadComplementary = ({ role, subject, stagedThreads, current, showResolved
     createSort,
     subject
   ]);
-  const threads = useMemo2(() => {
-    return subject.threads.concat(stagedThreads ?? []).filter(nonNullable2);
+  const threads2 = useMemo2(() => {
+    return subject.threads.concat(drafts ?? []).filter(nonNullable2);
   }, [
     JSON.stringify(subject.threads),
-    JSON.stringify(stagedThreads)
+    JSON.stringify(drafts)
   ]);
   const detachedIds = useMemo2(() => {
-    return threads.filter(({ anchor }) => !anchor).map((thread) => fullyQualifiedId3(thread));
+    return threads2.filter(({ anchor }) => !anchor).map((thread) => fullyQualifiedId3(thread));
   }, [
-    threads
+    threads2
   ]);
   useEffect2(() => {
     if (!sort) {
       return;
     }
-    threads.sort((a, b) => sort(a?.anchor, b?.anchor));
+    threads2.sort((a, b) => sort(a?.anchor, b?.anchor));
   }, [
     sort,
-    threads
+    threads2
   ]);
   const attended = useAttended();
   const qualifiedSubjectId = fullyQualifiedId3(subject);
-  return /* @__PURE__ */ React5.createElement("div", {
+  return /* @__PURE__ */ React3.createElement("div", {
     role: "none",
     className: "contents"
-  }, /* @__PURE__ */ React5.createElement(ScrollArea.Root, {
+  }, /* @__PURE__ */ React3.createElement(ScrollArea.Root, {
     classNames: "row-span-2"
-  }, /* @__PURE__ */ React5.createElement(ScrollArea.Viewport, null, /* @__PURE__ */ React5.createElement(CommentsContainer, {
-    threads,
+  }, /* @__PURE__ */ React3.createElement(ScrollArea.Viewport, null, /* @__PURE__ */ React3.createElement(CommentsContainer, {
+    threads: threads2,
     detached: detachedIds,
     currentId: attended.includes(qualifiedSubjectId) ? current : void 0,
     showResolvedThreads,
@@ -369,10 +347,117 @@ var ThreadComplementary = ({ role, subject, stagedThreads, current, showResolved
         }
       });
     }
-  }), /* @__PURE__ */ React5.createElement("div", {
+  }), /* @__PURE__ */ React3.createElement("div", {
     role: "none",
     className: "bs-10"
-  }), /* @__PURE__ */ React5.createElement(ScrollArea.Scrollbar, null, /* @__PURE__ */ React5.createElement(ScrollArea.Thumb, null)))));
+  }), /* @__PURE__ */ React3.createElement(ScrollArea.Scrollbar, null, /* @__PURE__ */ React3.createElement(ScrollArea.Thumb, null)))));
+};
+
+// packages/plugins/plugin-thread/src/components/ThreadSettings.tsx
+import React4 from "react";
+import { SettingsValue } from "@dxos/plugin-settings";
+import { Input, useTranslation as useTranslation3 } from "@dxos/react-ui";
+var ThreadSettings = ({ settings }) => {
+  const { t } = useTranslation3(THREAD_PLUGIN);
+  return /* @__PURE__ */ React4.createElement(React4.Fragment, null, /* @__PURE__ */ React4.createElement(SettingsValue, {
+    label: t("settings standalone label")
+  }, /* @__PURE__ */ React4.createElement(Input.Switch, {
+    checked: settings.standalone,
+    onCheckedChange: (checked) => settings.standalone = !!checked
+  })));
+};
+
+// packages/plugins/plugin-thread/src/components/index.ts
+var ThreadMain = React5.lazy(() => import("./ThreadMain-LEHGOF7R.mjs"));
+var ThreadArticle = React5.lazy(() => import("./ThreadArticle-ZTYD52TR.mjs"));
+
+// packages/plugins/plugin-thread/src/extensions/threads.ts
+import { EditorView } from "@codemirror/view";
+import { computed, effect } from "@preact/signals-core";
+import { ThreadType } from "@dxos/plugin-space/types";
+import { getSpace as getSpace2, getTextInRange, createDocAccessor, fullyQualifiedId as fullyQualifiedId4 } from "@dxos/react-client/echo";
+import { comments, createExternalCommentSync } from "@dxos/react-ui-editor";
+import { nonNullable as nonNullable3 } from "@dxos/util";
+var getName = (doc, anchor) => {
+  if (doc.content) {
+    const [start, end] = anchor.split(":");
+    return getTextInRange(createDocAccessor(doc.content, [
+      "content"
+    ]), start, end);
+  }
+};
+var threads = (state, doc, dispatch) => {
+  const space = doc && getSpace2(doc);
+  if (!doc || !space || !dispatch) {
+    return [
+      comments()
+    ];
+  }
+  const threads2 = computed(() => [
+    ...doc.threads.filter(nonNullable3),
+    ...state.drafts[fullyQualifiedId4(doc)] ?? []
+  ].filter((thread) => !(thread?.status === "resolved")));
+  return [
+    EditorView.updateListener.of((update) => {
+      if (update.docChanged) {
+        doc.threads.forEach((thread) => {
+          if (thread?.anchor) {
+            const name = getName(doc, thread.anchor);
+            if (name && name !== thread.name) {
+              thread.name = name;
+            }
+          }
+        });
+      }
+    }),
+    createExternalCommentSync(fullyQualifiedId4(doc), (sink) => effect(() => sink()), () => threads2.value.filter((thread) => thread?.anchor).map((thread) => ({
+      id: fullyQualifiedId4(thread),
+      cursor: thread.anchor
+    }))),
+    comments({
+      id: fullyQualifiedId4(doc),
+      onCreate: ({ cursor }) => {
+        const name = getName(doc, cursor);
+        void dispatch({
+          action: ThreadAction.CREATE,
+          data: {
+            cursor,
+            name,
+            subject: doc
+          }
+        });
+      },
+      onDelete: ({ id }) => {
+        const draft = state.drafts[fullyQualifiedId4(doc)];
+        if (draft) {
+          const index = draft.findIndex((thread2) => fullyQualifiedId4(thread2) === id);
+          if (index !== -1) {
+            draft.splice(index, 1);
+          }
+        }
+        const thread = doc.threads.find((thread2) => thread2?.id === id);
+        if (thread) {
+          thread.anchor = void 0;
+        }
+      },
+      onUpdate: ({ id, cursor }) => {
+        const thread = state.drafts[fullyQualifiedId4(doc)]?.find((thread2) => fullyQualifiedId4(thread2) === id) ?? doc.threads.find((thread2) => thread2?.id === id);
+        if (thread instanceof ThreadType && thread.anchor) {
+          thread.name = getName(doc, thread.anchor);
+          thread.anchor = cursor;
+        }
+      },
+      onSelect: ({ selection: { current, closest } }) => {
+        void dispatch({
+          action: ThreadAction.SELECT,
+          data: {
+            current: current ?? closest,
+            skipOpen: true
+          }
+        });
+      }
+    })
+  ];
 };
 
 // packages/plugins/plugin-thread/src/translations.ts
@@ -419,7 +504,7 @@ var initialViewState = {
 var ThreadPlugin = () => {
   const settings = new LocalStorageStore(THREAD_PLUGIN);
   const state = create2({
-    staging: {}
+    drafts: {}
   });
   const viewStore = create2({});
   const getViewState = (subjectId) => {
@@ -463,7 +548,7 @@ var ThreadPlugin = () => {
             // TODO(wittjosiah): Move out of metadata.
             loadReferences: (channel) => loadObjectReferences(channel, (channel2) => channel2.threads)
           },
-          [ThreadType.typename]: {
+          [ThreadType2.typename]: {
             // TODO(wittjosiah): Move out of metadata.
             loadReferences: (thread) => loadObjectReferences(thread, (thread2) => thread2.messages)
           },
@@ -499,7 +584,7 @@ var ThreadPlugin = () => {
       echo: {
         schema: [
           ChannelType,
-          ThreadType,
+          ThreadType2,
           MessageType2
         ]
       },
@@ -518,8 +603,8 @@ var ThreadPlugin = () => {
                 if (!id.endsWith("~comments")) {
                   return;
                 }
-                const subjectId = id.split("~").at(0);
-                const [spaceId, objectId] = subjectId?.split(":") ?? [];
+                const [subjectId] = id.split("~");
+                const [spaceId, objectId] = parseFullyQualifiedId(subjectId);
                 const space = client.spaces.get().find((space2) => space2.id === spaceId);
                 const object = toSignal((onChange) => {
                   const timeout = setTimeout(async () => {
@@ -655,8 +740,7 @@ var ThreadPlugin = () => {
                 settings: settings.values
               }) : null;
             }
-            case "article":
-            case "complementary": {
+            case "article": {
               const location = navigationPlugin?.provides.location;
               if (data.object instanceof ChannelType && data.object.threads[0]) {
                 const channel = data.object;
@@ -665,7 +749,7 @@ var ThreadPlugin = () => {
                   const currentPosition = layoutEntries.findIndex((entry) => channel.id === entry.id);
                   if (currentPosition > 0) {
                     const objectToTheLeft = layoutEntries[currentPosition - 1];
-                    const context = getSpace2(data.object)?.db.getObjectById(objectToTheLeft.id);
+                    const context = getSpace3(data.object)?.db.getObjectById(objectToTheLeft.id);
                     return /* @__PURE__ */ React6.createElement(ThreadArticle, {
                       thread: data.object.threads[0],
                       context
@@ -676,23 +760,27 @@ var ThreadPlugin = () => {
                   thread: data.object.threads[0]
                 });
               }
-              if (data.subject instanceof ThreadType) {
+              if (data.subject instanceof ThreadType2) {
                 return /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(ChatHeading, {
                   attendableId: data.subject.id
                 }), /* @__PURE__ */ React6.createElement(ChatContainer, {
                   thread: data.subject
                 }));
               }
+              break;
+            }
+            case "complementary--comments": {
               if (data.subject && typeof data.subject === "object" && "threads" in data.subject && Array.isArray(data.subject.threads)) {
-                const { showResolvedThreads } = getViewState(fullyQualifiedId4(data.subject));
+                const { showResolvedThreads } = getViewState(fullyQualifiedId5(data.subject));
                 return /* @__PURE__ */ React6.createElement(ThreadComplementary, {
                   role,
                   subject: data.subject,
-                  stagedThreads: state.staging[fullyQualifiedId4(data.subject)],
+                  drafts: state.drafts[fullyQualifiedId5(data.subject)],
                   current: state.current,
                   showResolvedThreads
                 });
               }
+              break;
             }
           }
           return null;
@@ -707,28 +795,28 @@ var ThreadPlugin = () => {
                 if (subject?.threads === void 0) {
                   try {
                     subject.threads = [];
-                  } catch (e) {
+                  } catch (err) {
                     log.error("Subject does not support threads array", subject?.typename, {
                       F: __dxlog_file,
-                      L: 331,
+                      L: 327,
                       S: void 0,
                       C: (f, a) => f(...a)
                     });
                     return;
                   }
                 }
-                const subjectId = fullyQualifiedId4(subject);
-                const thread = create2(ThreadType, {
+                const subjectId = fullyQualifiedId5(subject);
+                const thread = create2(ThreadType2, {
                   name,
                   anchor: cursor,
                   messages: [],
                   status: "staged"
                 });
-                const stagingArea = state.staging[subjectId];
-                if (stagingArea) {
-                  stagingArea.push(thread);
+                const draft = state.drafts[subjectId];
+                if (draft) {
+                  draft.push(thread);
                 } else {
-                  state.staging[subjectId] = [
+                  state.drafts[subjectId] = [
                     thread
                   ];
                 }
@@ -739,15 +827,17 @@ var ThreadPlugin = () => {
                       {
                         action: ThreadAction.SELECT,
                         data: {
-                          current: fullyQualifiedId4(thread)
+                          current: fullyQualifiedId5(thread)
                         }
-                      },
+                      }
+                    ],
+                    [
                       {
-                        action: LayoutAction2.SET_LAYOUT,
+                        action: NavigationAction.OPEN,
                         data: {
-                          element: "complementary",
-                          subject: subjectId,
-                          state: true
+                          activeParts: {
+                            complementary: "comments"
+                          }
                         }
                       }
                     ]
@@ -757,7 +847,7 @@ var ThreadPlugin = () => {
                 return {
                   data: create2(ChannelType, {
                     threads: [
-                      create2(ThreadType, {
+                      create2(ThreadType2, {
                         messages: []
                       })
                     ]
@@ -768,12 +858,24 @@ var ThreadPlugin = () => {
             case ThreadAction.SELECT: {
               state.current = intent.data?.current;
               return {
-                data: true
+                data: true,
+                intents: !intent.data?.skipOpen ? [
+                  [
+                    {
+                      action: NavigationAction.OPEN,
+                      data: {
+                        activeParts: {
+                          complementary: "comments"
+                        }
+                      }
+                    }
+                  ]
+                ] : []
               };
             }
             case ThreadAction.TOGGLE_RESOLVED: {
               const { thread } = intent.data ?? {};
-              if (!(thread instanceof ThreadType)) {
+              if (!(thread instanceof ThreadType2)) {
                 return;
               }
               if (thread.status === "active" || thread.status === void 0) {
@@ -781,9 +883,10 @@ var ThreadPlugin = () => {
               } else if (thread.status === "resolved") {
                 thread.status = "active";
               }
-              const space = getSpace2(thread);
+              const space = getSpace3(thread);
               const spaceId = space?.id;
               return {
+                data: true,
                 intents: [
                   [
                     {
@@ -802,21 +905,21 @@ var ThreadPlugin = () => {
             }
             case ThreadAction.DELETE: {
               const { subject, thread } = intent.data ?? {};
-              if (!(thread instanceof ThreadType) || !(subject && typeof subject === "object" && "threads" in subject)) {
+              if (!(thread instanceof ThreadType2) || !(subject && typeof subject === "object" && "threads" in subject)) {
                 return;
               }
-              const subjectId = fullyQualifiedId4(subject);
-              const stagingArea = state.staging[subjectId];
-              if (stagingArea) {
-                const index = stagingArea.findIndex((t) => t.id === thread.id);
+              const subjectId = fullyQualifiedId5(subject);
+              const draft = state.drafts[subjectId];
+              if (draft) {
+                const index = draft.findIndex((t) => t.id === thread.id);
                 if (index !== -1) {
-                  stagingArea.splice(index, 1);
+                  draft.splice(index, 1);
                   return {
                     data: true
                   };
                 }
               }
-              const space = getSpace2(thread);
+              const space = getSpace3(thread);
               if (!space || !subject.threads) {
                 return;
               }
@@ -874,22 +977,22 @@ var ThreadPlugin = () => {
             }
             case ThreadAction.ON_MESSAGE_ADD: {
               const { thread, subject } = intent.data ?? {};
-              if (!(thread instanceof ThreadType) || !(subject && typeof subject === "object" && "threads" in subject && Array.isArray(subject.threads))) {
+              if (!(thread instanceof ThreadType2) || !(subject && typeof subject === "object" && "threads" in subject && Array.isArray(subject.threads))) {
                 return;
               }
-              const subjectId = fullyQualifiedId4(subject);
-              const space = getSpace2(subject);
+              const subjectId = fullyQualifiedId5(subject);
+              const space = getSpace3(subject);
               const intents = [];
               const analyticsProperties = {
                 threadId: thread.id,
                 spaceId: space?.id
               };
-              if (state.staging[subjectId]?.find((t) => t === thread)) {
+              if (state.drafts[subjectId]?.find((t) => t === thread)) {
                 thread.status = "active";
                 subject.threads ? subject.threads.push(thread) : subject.threads = [
                   thread
                 ];
-                state.staging[subjectId] = state.staging[subjectId]?.filter((t) => t.id !== thread.id);
+                state.drafts[subjectId] = state.drafts[subjectId]?.filter(({ id }) => id !== thread.id);
                 intents.push({
                   action: ObservabilityAction.SEND_EVENT,
                   data: {
@@ -917,8 +1020,8 @@ var ThreadPlugin = () => {
             }
             case ThreadAction.DELETE_MESSAGE: {
               const { subject, thread, messageId } = intent.data ?? {};
-              const space = getSpace2(subject);
-              if (!(thread instanceof ThreadType) || !(subject && typeof subject === "object" && "threads" in subject)) {
+              const space = getSpace3(subject);
+              if (!(thread instanceof ThreadType2) || !(subject && typeof subject === "object" && "threads" in subject)) {
                 return;
               }
               if (!intent.undo) {
@@ -997,92 +1100,8 @@ var ThreadPlugin = () => {
         }
       },
       markdown: {
-        // TODO(burdon): Factor out extension factory into separate file (for simplicity).
         extensions: ({ document: doc }) => {
-          const space = doc && getSpace2(doc);
-          if (!doc || !space) {
-            return [
-              comments()
-            ];
-          }
-          const threads = computed(() => [
-            ...doc.threads.filter(nonNullable3),
-            ...state.staging[fullyQualifiedId4(doc)] ?? []
-          ].filter((thread) => !(thread?.status === "resolved")));
-          return [
-            listener2({
-              onChange: () => {
-                doc.threads.forEach((thread) => {
-                  if (thread?.anchor) {
-                    const [start, end] = thread.anchor.split(":");
-                    const name = doc.content && getTextInRange(createDocAccessor(doc.content, [
-                      "content"
-                    ]), start, end);
-                    if (name && name !== thread.name) {
-                      thread.name = name;
-                    }
-                  }
-                });
-              }
-            }),
-            createExternalCommentSync(fullyQualifiedId4(doc), (sink) => effect(() => sink()), () => threads.value.filter((thread) => thread?.anchor).map((thread) => ({
-              id: fullyQualifiedId4(thread),
-              cursor: thread.anchor
-            }))),
-            comments({
-              id: fullyQualifiedId4(doc),
-              onCreate: ({ cursor }) => {
-                const [start, end] = cursor.split(":");
-                const name = doc.content && getTextInRange(createDocAccessor(doc.content, [
-                  "content"
-                ]), start, end);
-                void intentPlugin?.provides.intent.dispatch({
-                  action: ThreadAction.CREATE,
-                  data: {
-                    cursor,
-                    name,
-                    subject: doc
-                  }
-                });
-              },
-              onDelete: ({ id }) => {
-                const stagingArea = state.staging[fullyQualifiedId4(doc)];
-                if (stagingArea) {
-                  const index = stagingArea.findIndex((thread2) => fullyQualifiedId4(thread2) === id);
-                  if (index !== -1) {
-                    stagingArea.splice(index, 1);
-                  }
-                }
-                const thread = doc.threads.find((thread2) => thread2?.id === id);
-                if (thread) {
-                  thread.anchor = void 0;
-                }
-              },
-              onUpdate: ({ id, cursor }) => {
-                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, [
-                    "content"
-                  ]), start, end);
-                  thread.anchor = cursor;
-                }
-              },
-              onSelect: ({ selection: { current, closest } }) => {
-                const dispatch = intentPlugin?.provides.intent.dispatch;
-                if (dispatch) {
-                  void dispatch([
-                    {
-                      action: ThreadAction.SELECT,
-                      data: {
-                        current: current ?? closest
-                      }
-                    }
-                  ]);
-                }
-              }
-            })
-          ];
+          return threads(state, doc, intentPlugin?.provides.intent.dispatch);
         }
       }
     }