@dxos/plugin-thread 0.6.13 → 0.6.14-main.69511f5

package/dist/lib/node/index.cjs

@@ -28,73 +28,68 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var node_exports = {};
 __export(node_exports, {
-  ThreadAction: () => import_chunk_D5GOVXHS.ThreadAction,
+  ThreadAction: () => import_chunk_A2IORKQK.ThreadAction,
   ThreadPlugin: () => ThreadPlugin,
   default: () => src_default,
-  useAnalyticsCallback: () => import_chunk_5PZNPPQF.useAnalyticsCallback,
-  useOnEditAnalytics: () => import_chunk_5PZNPPQF.useOnEditAnalytics,
-  useStatus: () => import_chunk_5PZNPPQF.useStatus
+  useAnalyticsCallback: () => import_chunk_HWN7Q5XK.useAnalyticsCallback,
+  useOnEditAnalytics: () => import_chunk_HWN7Q5XK.useOnEditAnalytics,
+  useStatus: () => import_chunk_HWN7Q5XK.useStatus
 });
 module.exports = __toCommonJS(node_exports);
-var import_chunk_D5GOVXHS = require("./chunk-D5GOVXHS.cjs");
-var import_chunk_5PZNPPQF = require("./chunk-5PZNPPQF.cjs");
-var import_chunk_BWBONZGU = require("./chunk-BWBONZGU.cjs");
-var import_react = require("@phosphor-icons/react");
-var import_signals_core = require("@preact/signals-core");
-var import_react2 = __toESM(require("react"));
+var import_chunk_A2IORKQK = require("./chunk-A2IORKQK.cjs");
+var import_chunk_HWN7Q5XK = require("./chunk-HWN7Q5XK.cjs");
+var import_chunk_JIJ7Z6NO = require("./chunk-JIJ7Z6NO.cjs");
+var import_react = __toESM(require("react"));
 var import_app_framework = require("@dxos/app-framework");
-var import_echo_schema = require("@dxos/echo-schema");
-var import_echo_schema2 = require("@dxos/echo-schema");
 var import_local_storage = require("@dxos/local-storage");
-var import_plugin_attention = require("@dxos/plugin-attention");
+var import_log = require("@dxos/log");
 var import_plugin_client = require("@dxos/plugin-client");
 var import_plugin_graph = require("@dxos/plugin-graph");
-var import_types = require("@dxos/plugin-markdown/types");
 var import_meta = require("@dxos/plugin-observability/meta");
 var import_plugin_space = require("@dxos/plugin-space");
-var import_types2 = require("@dxos/plugin-space/types");
+var import_types = require("@dxos/plugin-space/types");
 var import_echo = require("@dxos/react-client/echo");
+var import_echo2 = require("@dxos/react-client/echo");
+var import_react_ui_thread = require("@dxos/react-ui-thread");
+var import_react2 = require("react");
+var import_react3 = require("@phosphor-icons/react");
+var import_react4 = __toESM(require("react"));
+var import_echo_schema = require("@dxos/echo-schema");
+var import_types2 = require("@dxos/plugin-space/types");
+var import_echo3 = require("@dxos/react-client/echo");
+var import_halo = require("@dxos/react-client/halo");
 var import_react_ui = require("@dxos/react-ui");
-var import_react_ui_attention = require("@dxos/react-ui-attention");
 var import_react_ui_editor = require("@dxos/react-ui-editor");
-var import_react_ui_thread = require("@dxos/react-ui-thread");
+var import_react_ui_theme = require("@dxos/react-ui-theme");
+var import_react_ui_thread2 = require("@dxos/react-ui-thread");
 var import_util = require("@dxos/util");
-var import_react3 = __toESM(require("react"));
-var import_react4 = __toESM(require("react"));
-var import_plugin_settings = require("@dxos/plugin-settings");
-var import_react_ui2 = require("@dxos/react-ui");
 var import_react5 = require("@phosphor-icons/react");
 var import_react6 = __toESM(require("react"));
-var import_echo_schema3 = require("@dxos/echo-schema");
-var import_types3 = require("@dxos/plugin-space/types");
-var import_echo2 = require("@dxos/react-client/echo");
-var import_halo = require("@dxos/react-client/halo");
+var import_echo4 = require("@dxos/react-client/echo");
+var import_react_ui2 = require("@dxos/react-ui");
+var import_react_ui_theme2 = require("@dxos/react-ui-theme");
+var import_react7 = __toESM(require("react"));
+var import_app_framework2 = require("@dxos/app-framework");
+var import_echo5 = require("@dxos/react-client/echo");
 var import_react_ui3 = require("@dxos/react-ui");
-var import_react_ui_editor2 = require("@dxos/react-ui-editor");
-var import_react_ui_theme = require("@dxos/react-ui-theme");
-var import_react_ui_thread2 = require("@dxos/react-ui-thread");
+var import_react_ui_attention = require("@dxos/react-ui-attention");
 var import_util2 = require("@dxos/util");
-var import_react7 = require("@phosphor-icons/react");
 var import_react8 = __toESM(require("react"));
 var import_react_ui4 = require("@dxos/react-ui");
-var import_react_ui_deck = require("@dxos/react-ui-deck");
-var import_react_ui_theme2 = require("@dxos/react-ui-theme");
-var ThreadSettings = ({ settings }) => {
-  const { t } = (0, import_react_ui2.useTranslation)(import_chunk_BWBONZGU.THREAD_PLUGIN);
-  return /* @__PURE__ */ import_react4.default.createElement(import_react4.default.Fragment, null, /* @__PURE__ */ import_react4.default.createElement(import_plugin_settings.SettingsValue, {
-    label: t("settings standalone label")
-  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui2.Input.Switch, {
-    checked: settings.standalone,
-    onCheckedChange: (checked) => settings.standalone = !!checked
-  })));
-};
+var import_react_ui_data = require("@dxos/react-ui-data");
+var import_view = require("@codemirror/view");
+var import_signals_core = require("@preact/signals-core");
+var import_types3 = require("@dxos/plugin-space/types");
+var import_echo6 = require("@dxos/react-client/echo");
+var import_react_ui_editor2 = require("@dxos/react-ui-editor");
+var import_util3 = require("@dxos/util");
 var sizeClass = (0, import_react_ui_theme.getSize)(4);
 var ToggleResolvedButton = ({ isResolved, onResolve }) => {
-  const { t } = (0, import_react_ui3.useTranslation)(import_chunk_BWBONZGU.THREAD_PLUGIN);
+  const { t } = (0, import_react_ui.useTranslation)(import_chunk_JIJ7Z6NO.THREAD_PLUGIN);
   const label = t(isResolved ? "mark as unresolved label" : "mark as resolved label");
-  return /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Root, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Trigger, {
+  return /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Root, null, /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Trigger, {
     asChild: true
-  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Button, {
+  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Button, {
     variant: "ghost",
     "data-testid": "thread.toggle-resolved",
     onClick: onResolve,
@@ -102,23 +97,23 @@ var ToggleResolvedButton = ({ isResolved, onResolve }) => {
       "min-bs-0 p-1",
       !isResolved && import_react_ui_theme.hoverableControlItem
     ]
-  }, /* @__PURE__ */ import_react6.default.createElement("span", {
+  }, /* @__PURE__ */ import_react4.default.createElement("span", {
     className: "sr-only"
-  }, label), isResolved ? /* @__PURE__ */ import_react6.default.createElement(import_react5.CheckCircle, {
+  }, label), isResolved ? /* @__PURE__ */ import_react4.default.createElement(import_react3.CheckCircle, {
     className: sizeClass,
     weight: "fill"
-  }) : /* @__PURE__ */ import_react6.default.createElement(import_react5.CheckCircle, {
+  }) : /* @__PURE__ */ import_react4.default.createElement(import_react3.CheckCircle, {
     className: sizeClass
-  }))), /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Portal, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Content, {
+  }))), /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Portal, null, /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Content, {
     classNames: "z-[21]"
-  }, label, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Arrow, null))));
+  }, label, /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Arrow, null))));
 };
 var DeleteThreadButton = ({ onDelete }) => {
-  const { t } = (0, import_react_ui3.useTranslation)(import_chunk_BWBONZGU.THREAD_PLUGIN);
+  const { t } = (0, import_react_ui.useTranslation)(import_chunk_JIJ7Z6NO.THREAD_PLUGIN);
   const label = t("delete thread label");
-  return /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Root, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Trigger, {
+  return /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Root, null, /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Trigger, {
     asChild: true
-  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Button, {
+  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Button, {
     variant: "ghost",
     "data-testid": "thread.delete",
     onClick: onDelete,
@@ -126,55 +121,49 @@ var DeleteThreadButton = ({ onDelete }) => {
       "min-bs-0 p-1",
       import_react_ui_theme.hoverableControlItem
     ]
-  }, /* @__PURE__ */ import_react6.default.createElement("span", {
+  }, /* @__PURE__ */ import_react4.default.createElement("span", {
     className: "sr-only"
-  }, label), /* @__PURE__ */ import_react6.default.createElement(import_react5.X, {
+  }, label), /* @__PURE__ */ import_react4.default.createElement(import_react3.X, {
     className: sizeClass
-  }))), /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Portal, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Content, {
+  }))), /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Portal, null, /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Content, {
     classNames: "z-[21]"
-  }, label, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Arrow, null))));
+  }, label, /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Arrow, null))));
 };
-var CommentContainer = ({ thread, detached, context, current, autoFocusTextbox, onAttend, onThreadDelete, onMessageDelete, onResolve, onComment }) => {
+var CommentContainer = ({ thread, detached, context, current, onAttend, onThreadDelete, onMessageDelete, onResolve, onComment }) => {
   const identity = (0, import_halo.useIdentity)();
-  const space = (0, import_echo2.getSpace)(thread);
-  const members = (0, import_echo2.useMembers)(space?.key);
-  const activity = (0, import_chunk_5PZNPPQF.useStatus)(space, thread.id);
-  const { t } = (0, import_react_ui3.useTranslation)(import_chunk_BWBONZGU.THREAD_PLUGIN);
-  const threadScrollRef = (0, import_react6.useRef)(null);
-  const [autoFocus, setAutoFocus] = (0, import_react6.useState)(!!autoFocusTextbox);
-  const { themeMode } = (0, import_react_ui3.useThemeContext)();
-  const textboxMetadata = (0, import_chunk_5PZNPPQF.getMessageMetadata)(thread.id, identity);
-  const [_count, _setCount] = (0, import_react6.useState)(0);
+  const space = (0, import_echo3.getSpace)(thread);
+  const members = (0, import_echo3.useMembers)(space?.key);
+  const activity = (0, import_chunk_HWN7Q5XK.useStatus)(space, (0, import_echo3.fullyQualifiedId)(thread));
+  const { t } = (0, import_react_ui.useTranslation)(import_chunk_JIJ7Z6NO.THREAD_PLUGIN);
+  const threadScrollRef = (0, import_react4.useRef)(null);
+  const { themeMode } = (0, import_react_ui.useThemeContext)();
+  const textboxMetadata = (0, import_chunk_HWN7Q5XK.getMessageMetadata)((0, import_echo3.fullyQualifiedId)(thread), identity);
+  const [_count, _setCount] = (0, import_react4.useState)(0);
   const rerenderEditor = () => _setCount((count) => count + 1);
-  const messageRef = (0, import_react6.useRef)("");
-  const extensions = (0, import_react6.useMemo)(() => [
-    (0, import_react_ui_editor2.createBasicExtensions)({
+  const messageRef = (0, import_react4.useRef)("");
+  const extensions = (0, import_react4.useMemo)(() => [
+    (0, import_react_ui_editor.createBasicExtensions)({
       placeholder: t("message placeholder")
     }),
-    (0, import_react_ui_editor2.createThemeExtensions)({
+    (0, import_react_ui_editor.createThemeExtensions)({
       themeMode
     }),
-    (0, import_react_ui_editor2.listener)({
+    (0, import_react_ui_editor.listener)({
       onChange: (text) => messageRef.current = text
     }),
-    import_chunk_5PZNPPQF.command
+    import_chunk_HWN7Q5XK.command
   ], [
     _count
   ]);
-  (0, import_react6.useEffect)(() => {
-    setAutoFocus(!!autoFocusTextbox);
-  }, [
-    autoFocusTextbox
-  ]);
   const scrollToEnd = (behavior) => setTimeout(() => threadScrollRef.current?.scrollIntoView({
     behavior,
     block: "end"
   }), 10);
-  const handleCreate = (0, import_react6.useCallback)(() => {
+  const handleCreate = (0, import_react4.useCallback)(() => {
     if (!messageRef.current) {
       return false;
     }
-    thread.messages.push((0, import_echo_schema3.create)(import_types3.MessageType, {
+    thread.messages.push((0, import_echo_schema.create)(import_types2.MessageType, {
       sender: {
         identityKey: identity.identityKey.toHex()
       },
@@ -184,7 +173,6 @@ var CommentContainer = ({ thread, detached, context, current, autoFocusTextbox,
     }));
     onComment?.(thread);
     messageRef.current = "";
-    setAutoFocus(true);
     scrollToEnd("instant");
     rerenderEditor();
     return true;
@@ -192,64 +180,51 @@ var CommentContainer = ({ thread, detached, context, current, autoFocusTextbox,
     thread,
     identity
   ]);
-  const handleDeleteMessage = (id) => onMessageDelete?.(id);
-  return /* @__PURE__ */ import_react6.default.createElement(import_react_ui_thread2.Thread, {
+  return /* @__PURE__ */ import_react4.default.createElement(import_react_ui_thread2.Thread, {
     onClickCapture: onAttend,
     onFocusCapture: onAttend,
     current,
-    id: thread.id
-  }, /* @__PURE__ */ import_react6.default.createElement("div", {
+    id: (0, import_echo3.fullyQualifiedId)(thread)
+  }, /* @__PURE__ */ import_react4.default.createElement("div", {
     role: "none",
     className: (0, import_react_ui_theme.mx)("col-span-2 grid grid-cols-[var(--rail-size)_1fr_min-content]", import_react_ui_theme.hoverableControls, import_react_ui_theme.hoverableFocusedWithinControls)
-  }, detached ? /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Root, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Trigger, {
+  }, detached ? /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Root, null, /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Trigger, {
     asChild: true
-  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui_thread2.ThreadHeading, {
+  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui_thread2.ThreadHeading, {
     detached: true
-  }, thread.name ?? t("thread title placeholder"))), /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Portal, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Content, {
+  }, thread.name ?? t("thread title placeholder"))), /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Portal, null, /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Content, {
     classNames: "z-[21]",
     side: "top"
-  }, t("detached thread label"), /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Arrow, null)))) : /* @__PURE__ */ import_react6.default.createElement(import_react_ui_thread2.ThreadHeading, null, thread.name ?? t("thread title placeholder")), /* @__PURE__ */ import_react6.default.createElement("div", {
+  }, t("detached thread label"), /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Arrow, null)))) : /* @__PURE__ */ import_react4.default.createElement(import_react_ui_thread2.ThreadHeading, null, thread.name ?? t("thread title placeholder")), /* @__PURE__ */ import_react4.default.createElement("div", {
     className: "flex flex-row items-center pli-1"
-  }, thread.status === "staged" && /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tag, {
+  }, thread.status === "staged" && /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tag, {
     palette: "neutral"
-  }, t("draft button")), onResolve && !(thread?.status === "staged") && /* @__PURE__ */ import_react6.default.createElement(ToggleResolvedButton, {
+  }, t("draft button")), onResolve && !(thread?.status === "staged") && /* @__PURE__ */ import_react4.default.createElement(ToggleResolvedButton, {
     isResolved: thread?.status === "resolved",
     onResolve
-  }), onThreadDelete && /* @__PURE__ */ import_react6.default.createElement(DeleteThreadButton, {
+  }), onThreadDelete && /* @__PURE__ */ import_react4.default.createElement(DeleteThreadButton, {
     onDelete: onThreadDelete
-  }))), thread.messages.filter(import_util2.nonNullable).map((message) => /* @__PURE__ */ import_react6.default.createElement(import_chunk_5PZNPPQF.MessageContainer, {
+  }))), thread.messages.filter(import_util.nonNullable).map((message) => /* @__PURE__ */ import_react4.default.createElement(import_chunk_HWN7Q5XK.MessageContainer, {
     key: message.id,
     message,
     members,
-    onDelete: handleDeleteMessage
-  })), /* @__PURE__ */ import_react6.default.createElement(import_react_ui_thread2.MessageTextbox, {
+    onDelete: (id) => onMessageDelete?.(id)
+  })), /* @__PURE__ */ import_react4.default.createElement(import_react_ui_thread2.MessageTextbox, {
     extensions,
-    autoFocus,
     onSend: handleCreate,
     ...textboxMetadata
-  }), /* @__PURE__ */ import_react6.default.createElement(import_react_ui_thread2.ThreadFooter, {
+  }), /* @__PURE__ */ import_react4.default.createElement(import_react_ui_thread2.ThreadFooter, {
     activity
-  }, t("activity message")), /* @__PURE__ */ import_react6.default.createElement("div", {
+  }, t("activity message")), /* @__PURE__ */ import_react4.default.createElement("div", {
     role: "none",
     className: "bs-px -mbs-px",
     ref: threadScrollRef
   }));
 };
-var CommentsHeading = ({ attendableId }) => {
-  const { t } = (0, import_react_ui4.useTranslation)(import_chunk_BWBONZGU.THREAD_PLUGIN);
-  return /* @__PURE__ */ import_react8.default.createElement("div", {
-    role: "none",
-    className: "flex items-center"
-  }, /* @__PURE__ */ import_react8.default.createElement(import_react_ui_deck.PlankHeading.Button, {
-    attendableId
-  }, /* @__PURE__ */ import_react8.default.createElement(import_react7.Quotes, import_react_ui_deck.plankHeadingIconProps)), /* @__PURE__ */ import_react8.default.createElement(import_react_ui_deck.PlankHeading.Label, {
-    attendableId
-  }, t("comments heading")));
-};
-var CommentsContainer = ({ threads, detached = [], currentId, autoFocusCurrentTextbox, showResolvedThreads, onThreadAttend, onThreadDelete, onMessageDelete, onThreadToggleResolved, ...props }) => {
-  const { t } = (0, import_react_ui4.useTranslation)(import_chunk_BWBONZGU.THREAD_PLUGIN);
-  const filteredThreads = showResolvedThreads ? threads : threads.filter((thread) => !(thread?.status === "resolved"));
-  (0, import_react8.useEffect)(() => {
+var CommentsContainer = ({ threads: threads2, detached = [], currentId, showResolvedThreads, onThreadAttend, onThreadDelete, onMessageDelete, onThreadToggleResolved, ...props }) => {
+  const { t } = (0, import_react_ui2.useTranslation)(import_chunk_JIJ7Z6NO.THREAD_PLUGIN);
+  const filteredThreads = showResolvedThreads ? threads2 : threads2.filter((thread) => !(thread?.status === "resolved"));
+  (0, import_react6.useEffect)(() => {
     if (currentId) {
       document.getElementById(currentId)?.scrollIntoView({
         behavior: "smooth",
@@ -259,46 +234,241 @@ var CommentsContainer = ({ threads, detached = [], currentId, autoFocusCurrentTe
   }, [
     currentId
   ]);
-  return /* @__PURE__ */ import_react8.default.createElement(import_react8.default.Fragment, null, filteredThreads.length > 0 ? filteredThreads.map((thread) => /* @__PURE__ */ import_react8.default.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__ */ import_react8.default.createElement("div", {
+  return /* @__PURE__ */ import_react6.default.createElement(import_react6.default.Fragment, null, filteredThreads.length > 0 ? filteredThreads.map((thread) => {
+    const threadId = (0, import_echo4.fullyQualifiedId)(thread);
+    return /* @__PURE__ */ import_react6.default.createElement(CommentContainer, {
+      key: threadId,
+      thread,
+      current: currentId === threadId,
+      detached: detached.includes(threadId),
+      ...onThreadAttend && {
+        onAttend: () => onThreadAttend(thread)
+      },
+      ...onThreadDelete && {
+        onThreadDelete: () => onThreadDelete(thread)
+      },
+      ...onMessageDelete && {
+        onMessageDelete: (messageId) => onMessageDelete(thread, messageId)
+      },
+      ...onThreadToggleResolved && {
+        onResolve: () => onThreadToggleResolved(thread)
+      },
+      ...props
+    });
+  }) : /* @__PURE__ */ import_react6.default.createElement("div", {
     role: "alert",
     className: (0, import_react_ui_theme2.mx)(import_react_ui_theme2.descriptionText, "place-self-center border border-dashed border-neutral-400/50 rounded-lg text-center p-4 m-4")
-  }, /* @__PURE__ */ import_react8.default.createElement("h2", {
+  }, /* @__PURE__ */ import_react6.default.createElement("h2", {
     className: "mbe-2 font-medium text-baseText"
-  }, t("no comments title")), /* @__PURE__ */ import_react8.default.createElement("p", null, /* @__PURE__ */ import_react8.default.createElement(import_react_ui4.Trans, {
+  }, t("no comments title")), /* @__PURE__ */ import_react6.default.createElement("p", null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui2.Trans, {
     t,
     i18nKey: "no comments message",
     components: {
-      commentIcon: /* @__PURE__ */ import_react8.default.createElement(import_react7.ChatText, {
+      commentIcon: /* @__PURE__ */ import_react6.default.createElement(import_react5.ChatText, {
         className: "inline-block"
       })
     }
   }))));
 };
-var ThreadMain = import_react3.default.lazy(() => import("./ThreadMain-XJX75GHG.cjs"));
-var ThreadArticle = import_react3.default.lazy(() => import("./ThreadArticle-DO56JXBU.cjs"));
+var providesThreadsConfig = (plugin) => "thread" in plugin.provides ? plugin : void 0;
+var ThreadComplementary = ({ role, subject, drafts, current, showResolvedThreads }) => {
+  const dispatch = (0, import_app_framework2.useIntentDispatcher)();
+  const threadsIntegrators = (0, import_app_framework2.useResolvePlugins)(providesThreadsConfig);
+  const threadProvides = (0, import_react7.useMemo)(() => threadsIntegrators.map((p) => p.provides.thread), [
+    threadsIntegrators
+  ]);
+  const createSort = (0, import_react7.useMemo)(() => threadProvides.find((p) => p.predicate(subject))?.createSort, [
+    threadProvides,
+    subject
+  ]);
+  const sort = (0, import_react7.useMemo)(() => createSort?.(subject), [
+    createSort,
+    subject
+  ]);
+  const threads2 = (0, import_react7.useMemo)(() => {
+    return subject.threads.concat(drafts ?? []).filter(import_util2.nonNullable);
+  }, [
+    JSON.stringify(subject.threads),
+    JSON.stringify(drafts)
+  ]);
+  const detachedIds = (0, import_react7.useMemo)(() => {
+    return threads2.filter(({ anchor }) => !anchor).map((thread) => (0, import_echo5.fullyQualifiedId)(thread));
+  }, [
+    threads2
+  ]);
+  (0, import_react7.useEffect)(() => {
+    if (!sort) {
+      return;
+    }
+    threads2.sort((a, b) => sort(a?.anchor, b?.anchor));
+  }, [
+    sort,
+    threads2
+  ]);
+  const attended = (0, import_react_ui_attention.useAttended)();
+  const qualifiedSubjectId = (0, import_echo5.fullyQualifiedId)(subject);
+  return /* @__PURE__ */ import_react7.default.createElement("div", {
+    role: "none",
+    className: "contents"
+  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui3.ScrollArea.Root, {
+    classNames: "row-span-2"
+  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui3.ScrollArea.Viewport, null, /* @__PURE__ */ import_react7.default.createElement(CommentsContainer, {
+    threads: threads2,
+    detached: detachedIds,
+    currentId: attended.includes(qualifiedSubjectId) ? current : void 0,
+    showResolvedThreads,
+    onThreadAttend: (thread) => {
+      const threadId = (0, import_echo5.fullyQualifiedId)(thread);
+      if (current !== threadId) {
+        current = threadId;
+        void dispatch?.([
+          {
+            action: import_app_framework2.LayoutAction.SCROLL_INTO_VIEW,
+            data: {
+              id: (0, import_echo5.fullyQualifiedId)(subject),
+              thread: threadId,
+              cursor: thread.anchor
+            }
+          }
+        ]);
+      }
+    },
+    onThreadDelete: (thread) => {
+      return dispatch({
+        plugin: import_chunk_JIJ7Z6NO.THREAD_PLUGIN,
+        action: import_chunk_A2IORKQK.ThreadAction.DELETE,
+        data: {
+          subject,
+          thread
+        }
+      });
+    },
+    onMessageDelete: (thread, messageId) => dispatch({
+      plugin: import_chunk_JIJ7Z6NO.THREAD_PLUGIN,
+      action: import_chunk_A2IORKQK.ThreadAction.DELETE_MESSAGE,
+      data: {
+        subject,
+        thread,
+        messageId
+      }
+    }),
+    onThreadToggleResolved: (thread) => dispatch({
+      plugin: import_chunk_JIJ7Z6NO.THREAD_PLUGIN,
+      action: import_chunk_A2IORKQK.ThreadAction.TOGGLE_RESOLVED,
+      data: {
+        thread
+      }
+    }),
+    onComment: (thread) => {
+      void dispatch({
+        action: import_chunk_A2IORKQK.ThreadAction.ON_MESSAGE_ADD,
+        data: {
+          thread,
+          subject
+        }
+      });
+    }
+  }), /* @__PURE__ */ import_react7.default.createElement("div", {
+    role: "none",
+    className: "bs-10"
+  }), /* @__PURE__ */ import_react7.default.createElement(import_react_ui3.ScrollArea.Scrollbar, null, /* @__PURE__ */ import_react7.default.createElement(import_react_ui3.ScrollArea.Thumb, null)))));
+};
+var ThreadSettings = ({ settings }) => {
+  const { t } = (0, import_react_ui4.useTranslation)(import_chunk_JIJ7Z6NO.THREAD_PLUGIN);
+  return /* @__PURE__ */ import_react8.default.createElement(import_react8.default.Fragment, null, /* @__PURE__ */ import_react8.default.createElement(import_react_ui_data.FormInput, {
+    label: t("settings standalone label")
+  }, /* @__PURE__ */ import_react8.default.createElement(import_react_ui4.Input.Switch, {
+    checked: settings.standalone,
+    onCheckedChange: (checked) => settings.standalone = !!checked
+  })));
+};
+var ThreadMain = (0, import_react2.lazy)(() => import("./ThreadMain-V6KBUQLH.cjs"));
+var ThreadArticle = (0, import_react2.lazy)(() => import("./ThreadArticle-CIYBYISR.cjs"));
+var getName = (doc, anchor) => {
+  if (doc.content) {
+    const [start, end] = anchor.split(":");
+    return (0, import_echo6.getTextInRange)((0, import_echo6.createDocAccessor)(doc.content, [
+      "content"
+    ]), start, end);
+  }
+};
+var threads = (state, doc, dispatch) => {
+  const space = doc && (0, import_echo6.getSpace)(doc);
+  if (!doc || !space || !dispatch) {
+    return [
+      (0, import_react_ui_editor2.comments)()
+    ];
+  }
+  const threads2 = (0, import_signals_core.computed)(() => [
+    ...doc.threads.filter(import_util3.nonNullable),
+    ...state.drafts[(0, import_echo6.fullyQualifiedId)(doc)] ?? []
+  ].filter((thread) => !(thread?.status === "resolved")));
+  return [
+    import_view.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;
+            }
+          }
+        });
+      }
+    }),
+    (0, import_react_ui_editor2.createExternalCommentSync)((0, import_echo6.fullyQualifiedId)(doc), (sink) => (0, import_signals_core.effect)(() => sink()), () => threads2.value.filter((thread) => thread?.anchor).map((thread) => ({
+      id: (0, import_echo6.fullyQualifiedId)(thread),
+      cursor: thread.anchor
+    }))),
+    (0, import_react_ui_editor2.comments)({
+      id: (0, import_echo6.fullyQualifiedId)(doc),
+      onCreate: ({ cursor }) => {
+        const name = getName(doc, cursor);
+        void dispatch({
+          action: import_chunk_A2IORKQK.ThreadAction.CREATE,
+          data: {
+            cursor,
+            name,
+            subject: doc
+          }
+        });
+      },
+      onDelete: ({ id }) => {
+        const draft = state.drafts[(0, import_echo6.fullyQualifiedId)(doc)];
+        if (draft) {
+          const index = draft.findIndex((thread2) => (0, import_echo6.fullyQualifiedId)(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[(0, import_echo6.fullyQualifiedId)(doc)]?.find((thread2) => (0, import_echo6.fullyQualifiedId)(thread2) === id) ?? doc.threads.find((thread2) => thread2?.id === id);
+        if (thread instanceof import_types3.ThreadType && thread.anchor) {
+          thread.name = getName(doc, thread.anchor);
+          thread.anchor = cursor;
+        }
+      },
+      onSelect: ({ selection: { current, closest } }) => {
+        void dispatch({
+          action: import_chunk_A2IORKQK.ThreadAction.SELECT,
+          data: {
+            current: current ?? closest,
+            skipOpen: true
+          }
+        });
+      }
+    })
+  ];
+};
 var translations_default = [
   {
     "en-US": {
-      [import_chunk_BWBONZGU.THREAD_PLUGIN]: {
+      [import_chunk_JIJ7Z6NO.THREAD_PLUGIN]: {
         "plugin name": "Threads",
         "channel name placeholder": "New channel",
         "channel title label": "Title",
@@ -329,16 +499,16 @@ var translations_default = [
     }
   }
 ];
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/plugins/plugin-thread/src/ThreadPlugin.tsx";
 var initialViewState = {
   showResolvedThreads: false
 };
-var providesThreadsConfig = (plugin) => "thread" in plugin.provides ? plugin : void 0;
 var ThreadPlugin = () => {
-  const settings = new import_local_storage.LocalStorageStore(import_chunk_BWBONZGU.THREAD_PLUGIN);
-  const state = (0, import_echo_schema2.create)({
-    staging: {}
+  const settings = new import_local_storage.LocalStorageStore(import_chunk_JIJ7Z6NO.THREAD_PLUGIN);
+  const state = (0, import_echo.create)({
+    drafts: {}
   });
-  const viewStore = (0, import_echo_schema2.create)({});
+  const viewStore = (0, import_echo.create)({});
   const getViewState = (subjectId) => {
     if (!viewStore[subjectId]) {
       viewStore[subjectId] = {
@@ -347,13 +517,11 @@ var ThreadPlugin = () => {
     }
     return viewStore[subjectId];
   };
-  let attentionPlugin;
   let navigationPlugin;
   let intentPlugin;
-  let dispatch;
   const unsubscribeCallbacks = [];
   return {
-    meta: import_chunk_BWBONZGU.meta_default,
+    meta: import_chunk_JIJ7Z6NO.meta_default,
     ready: async (plugins) => {
       settings.prop({
         key: "standalone",
@@ -361,36 +529,8 @@ var ThreadPlugin = () => {
           allowUndefined: true
         })
       });
-      attentionPlugin = (0, import_app_framework.resolvePlugin)(plugins, import_plugin_attention.parseAttentionPlugin);
       navigationPlugin = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseNavigationPlugin);
       intentPlugin = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseIntentPlugin);
-      dispatch = intentPlugin?.provides.intent.dispatch;
-      const graphPlugin = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseGraphPlugin);
-      const client = (0, import_app_framework.resolvePlugin)(plugins, import_plugin_client.parseClientPlugin)?.provides.client;
-      if (!client) {
-        return;
-      }
-      const channelsQuery = client.spaces.query(import_echo.Filter.schema(import_types2.ChannelType));
-      const queryUnsubscribe = channelsQuery.subscribe();
-      const unsubscribe = (0, import_signals_core.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 import_types.DocumentType && (node.data.threads?.length ?? 0) > 0);
-        if (firstAttendedNodeWithComments) {
-          void intentPlugin?.provides.intent.dispatch({
-            action: import_app_framework.NavigationAction.OPEN,
-            data: {
-              activeParts: {
-                complementary: `${firstAttendedNodeWithComments.id}${import_app_framework.SLUG_PATH_SEPARATOR}comments`
-              }
-            }
-          });
-        }
-      });
-      unsubscribeCallbacks.push(queryUnsubscribe);
-      unsubscribeCallbacks.push(unsubscribe);
     },
     unload: async () => {
       unsubscribeCallbacks.forEach((unsubscribe) => unsubscribe());
@@ -399,27 +539,26 @@ var ThreadPlugin = () => {
       settings: settings.values,
       metadata: {
         records: {
-          [import_types2.ChannelType.typename]: {
+          [import_types.ChannelType.typename]: {
             placeholder: [
               "channel title placeholder",
               {
-                ns: import_chunk_BWBONZGU.THREAD_PLUGIN
+                ns: import_chunk_JIJ7Z6NO.THREAD_PLUGIN
               }
             ],
-            icon: (props) => /* @__PURE__ */ import_react2.default.createElement(import_react.Chat, props),
-            iconSymbol: "ph--chat--regular",
+            icon: "ph--chat--regular",
             // TODO(wittjosiah): Move out of metadata.
-            loadReferences: (channel) => (0, import_echo.loadObjectReferences)(channel, (channel2) => channel2.threads)
+            loadReferences: (channel) => (0, import_echo2.loadObjectReferences)(channel, (channel2) => channel2.threads)
           },
-          [import_types2.ThreadType.typename]: {
+          [import_types.ThreadType.typename]: {
             // TODO(wittjosiah): Move out of metadata.
-            loadReferences: (thread) => (0, import_echo.loadObjectReferences)(thread, (thread2) => thread2.messages)
+            loadReferences: (thread) => (0, import_echo2.loadObjectReferences)(thread, (thread2) => thread2.messages)
           },
-          [import_types2.MessageType.typename]: {
+          [import_types.MessageType.typename]: {
             // TODO(wittjosiah): Move out of metadata.
             loadReferences: (message) => []
           },
-          [import_chunk_BWBONZGU.THREAD_ITEM]: {
+          [import_chunk_JIJ7Z6NO.THREAD_ITEM]: {
             parse: (item, type) => {
               switch (type) {
                 case "node":
@@ -446,49 +585,77 @@ var ThreadPlugin = () => {
       ],
       echo: {
         schema: [
-          import_types2.ChannelType,
-          import_types2.ThreadType,
-          import_types2.MessageType
+          import_types.ChannelType,
+          import_types.ThreadType,
+          import_types.MessageType
         ]
       },
       graph: {
         builder: (plugins) => {
           const client = (0, import_app_framework.resolvePlugin)(plugins, import_plugin_client.parseClientPlugin)?.provides.client;
-          const dispatch2 = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseIntentPlugin)?.provides.intent.dispatch;
+          const dispatch = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseIntentPlugin)?.provides.intent.dispatch;
           const metadataResolver = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseMetadataResolverPlugin)?.provides.metadata.resolver;
-          if (!client || !dispatch2 || !metadataResolver) {
+          if (!client || !dispatch || !metadataResolver) {
             return [];
           }
+          const type = "orphan-comments-for-subject";
+          const icon = "ph--chat-text--regular";
           return [
             (0, import_plugin_graph.createExtension)({
-              id: `${import_chunk_BWBONZGU.THREAD_PLUGIN}/comments-for-subject`,
+              id: `${import_chunk_JIJ7Z6NO.THREAD_PLUGIN}/comments-for-subject`,
               resolver: ({ id }) => {
                 if (!id.endsWith("~comments")) {
                   return;
                 }
-                const docId = id.split("~").at(0);
-                const [spaceId, objectId] = docId?.split(":") ?? [];
+                const [subjectId] = id.split("~");
+                const { spaceId, objectId } = (0, import_echo2.parseId)(subjectId);
                 const space = client.spaces.get().find((space2) => space2.id === spaceId);
-                const doc = space?.db.getObjectById(objectId);
-                if (!doc || !docId) {
+                if (!objectId) {
+                  return {
+                    id,
+                    type,
+                    data: null,
+                    properties: {
+                      icon,
+                      label: [
+                        "unnamed object threads label",
+                        {
+                          ns: import_chunk_JIJ7Z6NO.THREAD_PLUGIN
+                        }
+                      ],
+                      showResolvedThreads: false,
+                      object: null,
+                      space
+                    }
+                  };
+                }
+                const object = (0, import_plugin_graph.toSignal)((onChange) => {
+                  const timeout = setTimeout(async () => {
+                    await space?.db.loadObjectById(objectId);
+                    onChange();
+                  });
+                  return () => clearTimeout(timeout);
+                }, () => space?.db.getObjectById(objectId), subjectId);
+                if (!object || !subjectId) {
                   return;
                 }
-                const docMeta = metadataResolver((0, import_echo_schema.getTypename)(doc) ?? "");
-                const label = docMeta.label?.(doc) || doc.name || docMeta.placeholder || [
+                const meta = metadataResolver((0, import_echo.getTypename)(object) ?? "");
+                const label = meta.label?.(object) || object.name || meta.placeholder || [
                   "unnamed object threads label",
                   {
-                    ns: import_chunk_BWBONZGU.THREAD_PLUGIN
+                    ns: import_chunk_JIJ7Z6NO.THREAD_PLUGIN
                   }
                 ];
-                const viewState = getViewState(docId);
+                const viewState = getViewState(subjectId);
                 return {
                   id,
-                  type: "orphan-comments-for-subject",
-                  data: doc,
+                  type,
+                  data: null,
                   properties: {
-                    icon: import_chunk_BWBONZGU.meta_default.iconComponent,
+                    icon,
                     label,
-                    showResolvedThreads: viewState.showResolvedThreads
+                    showResolvedThreads: viewState.showResolvedThreads,
+                    object
                   }
                 };
               },
@@ -502,7 +669,7 @@ var ThreadPlugin = () => {
                 const toggle = () => {
                   const newToggleState = !viewState.showResolvedThreads;
                   viewState.showResolvedThreads = newToggleState;
-                  void dispatch2({
+                  void dispatch({
                     action: import_meta.ObservabilityAction.SEND_EVENT,
                     data: {
                       name: "threads.toggle-show-resolved",
@@ -516,25 +683,26 @@ var ThreadPlugin = () => {
                 };
                 return [
                   {
-                    id: `${import_chunk_BWBONZGU.THREAD_PLUGIN}/toggle-show-resolved/${node.id}`,
+                    id: `${import_chunk_JIJ7Z6NO.THREAD_PLUGIN}/toggle-show-resolved/${node.id}`,
                     data: toggle,
                     properties: {
                       label: [
                         "toggle show resolved",
                         {
-                          ns: import_chunk_BWBONZGU.THREAD_PLUGIN
+                          ns: import_chunk_JIJ7Z6NO.THREAD_PLUGIN
                         }
                       ],
                       menuItemType: "toggle",
                       isChecked: viewState.showResolvedThreads,
-                      testId: "threadPlugin.toggleShowResolved"
+                      testId: "threadPlugin.toggleShowResolved",
+                      icon: viewState.showResolvedThreads ? "ph--eye-slash--regular" : "ph--eye--regular"
                     }
                   }
                 ];
               }
             }),
             (0, import_plugin_graph.createExtension)({
-              id: import_chunk_D5GOVXHS.ThreadAction.CREATE,
+              id: import_chunk_A2IORKQK.ThreadAction.CREATE,
               filter: (node) => !!settings.values.standalone && (0, import_plugin_graph.isActionGroup)(node) && node.id.startsWith(import_plugin_space.SpaceAction.ADD_OBJECT),
               actions: ({ node }) => {
                 const id = node.id.split("/").at(-1);
@@ -547,12 +715,12 @@ var ThreadPlugin = () => {
                 }
                 return [
                   {
-                    id: `${import_chunk_BWBONZGU.THREAD_PLUGIN}/create/${node.id}`,
+                    id: `${import_chunk_JIJ7Z6NO.THREAD_PLUGIN}/create/${node.id}`,
                     data: async () => {
-                      await dispatch2([
+                      await dispatch([
                         {
-                          plugin: import_chunk_BWBONZGU.THREAD_PLUGIN,
-                          action: import_chunk_D5GOVXHS.ThreadAction.CREATE
+                          plugin: import_chunk_JIJ7Z6NO.THREAD_PLUGIN,
+                          action: import_chunk_A2IORKQK.ThreadAction.CREATE
                         },
                         {
                           action: import_plugin_space.SpaceAction.ADD_OBJECT,
@@ -569,11 +737,10 @@ var ThreadPlugin = () => {
                       label: [
                         "create channel label",
                         {
-                          ns: import_chunk_BWBONZGU.THREAD_PLUGIN
+                          ns: import_chunk_JIJ7Z6NO.THREAD_PLUGIN
                         }
                       ],
-                      icon: (props) => /* @__PURE__ */ import_react2.default.createElement(import_react.Chat, props),
-                      iconSymbol: "ph--chat--regular",
+                      icon: "ph--chat--regular",
                       testId: "threadPlugin.createObject"
                     }
                   }
@@ -587,124 +754,56 @@ var ThreadPlugin = () => {
         component: ({ data, role }) => {
           switch (role) {
             case "main": {
-              return data.active instanceof import_types2.ChannelType && data.active.threads[0] ? /* @__PURE__ */ import_react2.default.createElement(ThreadMain, {
+              return data.active instanceof import_types.ChannelType && data.active.threads[0] ? /* @__PURE__ */ import_react.default.createElement(ThreadMain, {
                 thread: data.active.threads[0]
               }) : null;
             }
             case "settings": {
-              return data.plugin === import_chunk_BWBONZGU.meta_default.id ? /* @__PURE__ */ import_react2.default.createElement(ThreadSettings, {
+              return data.plugin === import_chunk_JIJ7Z6NO.meta_default.id ? /* @__PURE__ */ import_react.default.createElement(ThreadSettings, {
                 settings: settings.values
               }) : null;
             }
-            case "article":
-            case "complementary": {
+            case "article": {
               const location = navigationPlugin?.provides.location;
-              const threadsIntegrators = (0, import_app_framework.useResolvePlugins)(providesThreadsConfig);
-              const threadProvides = threadsIntegrators.map((p) => p.provides.thread);
-              if (data.object instanceof import_types2.ChannelType && data.object.threads[0]) {
+              if (data.object instanceof import_types.ChannelType && data.object.threads[0]) {
                 const channel = data.object;
                 if ((0, import_app_framework.isLayoutParts)(location?.active) && location.active.main) {
                   const layoutEntries = location.active.main;
                   const currentPosition = layoutEntries.findIndex((entry) => channel.id === entry.id);
                   if (currentPosition > 0) {
                     const objectToTheLeft = layoutEntries[currentPosition - 1];
-                    const context = (0, import_echo.getSpace)(data.object)?.db.getObjectById(objectToTheLeft.id);
-                    return /* @__PURE__ */ import_react2.default.createElement(ThreadArticle, {
+                    const context = (0, import_echo2.getSpace)(data.object)?.db.getObjectById(objectToTheLeft.id);
+                    return /* @__PURE__ */ import_react.default.createElement(ThreadArticle, {
                       thread: data.object.threads[0],
                       context
                     });
                   }
                 }
-                return /* @__PURE__ */ import_react2.default.createElement(ThreadArticle, {
+                return /* @__PURE__ */ import_react.default.createElement(ThreadArticle, {
                   thread: data.object.threads[0]
                 });
               }
-              if (data.subject instanceof import_types2.ThreadType) {
-                return /* @__PURE__ */ import_react2.default.createElement(import_react2.default.Fragment, null, /* @__PURE__ */ import_react2.default.createElement(import_chunk_5PZNPPQF.ChatHeading, {
+              if (data.subject instanceof import_types.ThreadType) {
+                return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_chunk_HWN7Q5XK.ChatHeading, {
                   attendableId: data.subject.id
-                }), /* @__PURE__ */ import_react2.default.createElement(import_chunk_5PZNPPQF.ChatContainer, {
+                }), /* @__PURE__ */ import_react.default.createElement(import_chunk_HWN7Q5XK.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 threads = data.subject.threads.concat(state.staging[(0, import_echo.fullyQualifiedId)(data.subject)]).filter(import_util.nonNullable);
-                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(import_util.nonNullable).filter(({ anchor }) => !anchor).map((thread) => thread.id);
-                const qualifiedSubjectId = (0, import_echo.fullyQualifiedId)(data.subject);
-                const attention = attentionPlugin?.provides.attention?.attended ?? /* @__PURE__ */ new Set([
-                  qualifiedSubjectId
-                ]);
-                const attendableAttrs = (0, import_react_ui_attention.createAttendableAttributes)(qualifiedSubjectId);
-                const { showResolvedThreads } = getViewState(qualifiedSubjectId);
-                return /* @__PURE__ */ import_react2.default.createElement("div", {
-                  role: "none",
-                  className: "contents group/attention",
-                  ...attendableAttrs
-                }, role === "complementary" && /* @__PURE__ */ import_react2.default.createElement(CommentsHeading, {
-                  attendableId: qualifiedSubjectId
-                }), /* @__PURE__ */ import_react2.default.createElement(import_react_ui.ScrollArea.Root, {
-                  classNames: "row-span-2"
-                }, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.ScrollArea.Viewport, null, /* @__PURE__ */ import_react2.default.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: import_app_framework.LayoutAction.SCROLL_INTO_VIEW,
-                        data: {
-                          id: (0, import_echo.fullyQualifiedId)(data.subject),
-                          thread: (0, import_echo.fullyQualifiedId)(thread),
-                          cursor: thread.anchor
-                        }
-                      });
-                    }
-                  },
-                  onThreadDelete: (thread) => dispatch?.({
-                    plugin: import_chunk_BWBONZGU.THREAD_PLUGIN,
-                    action: import_chunk_D5GOVXHS.ThreadAction.DELETE,
-                    data: {
-                      subject: data.subject,
-                      thread
-                    }
-                  }),
-                  onMessageDelete: (thread, messageId) => dispatch?.({
-                    plugin: import_chunk_BWBONZGU.THREAD_PLUGIN,
-                    action: import_chunk_D5GOVXHS.ThreadAction.DELETE_MESSAGE,
-                    data: {
-                      subject: data.subject,
-                      thread,
-                      messageId
-                    }
-                  }),
-                  onThreadToggleResolved: (thread) => dispatch?.({
-                    plugin: import_chunk_BWBONZGU.THREAD_PLUGIN,
-                    action: import_chunk_D5GOVXHS.ThreadAction.TOGGLE_RESOLVED,
-                    data: {
-                      thread
-                    }
-                  }),
-                  onComment: (thread) => {
-                    void intentPlugin?.provides.intent.dispatch({
-                      action: import_chunk_D5GOVXHS.ThreadAction.ON_MESSAGE_ADD,
-                      data: {
-                        thread,
-                        subject: data.subject
-                      }
-                    });
-                  }
-                }), /* @__PURE__ */ import_react2.default.createElement("div", {
-                  role: "none",
-                  className: "bs-10"
-                }), /* @__PURE__ */ import_react2.default.createElement(import_react_ui.ScrollArea.Scrollbar, null, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.ScrollArea.Thumb, null)))));
+                const { showResolvedThreads } = getViewState((0, import_echo2.fullyQualifiedId)(data.subject));
+                return /* @__PURE__ */ import_react.default.createElement(ThreadComplementary, {
+                  role,
+                  subject: data.subject,
+                  drafts: state.drafts[(0, import_echo2.fullyQualifiedId)(data.subject)],
+                  current: state.current,
+                  showResolvedThreads
+                });
               }
+              break;
             }
           }
           return null;
@@ -713,21 +812,34 @@ var ThreadPlugin = () => {
       intent: {
         resolver: async (intent) => {
           switch (intent.action) {
-            case import_chunk_D5GOVXHS.ThreadAction.CREATE: {
+            case import_chunk_A2IORKQK.ThreadAction.CREATE: {
               if (intent.data && intent.data.cursor !== void 0) {
                 const { cursor, name, subject } = intent.data;
-                const subjectId = (0, import_echo.fullyQualifiedId)(subject);
-                const thread = (0, import_echo_schema2.create)(import_types2.ThreadType, {
+                if (subject?.threads === void 0) {
+                  try {
+                    subject.threads = [];
+                  } catch (err) {
+                    import_log.log.error("Subject does not support threads array", subject?.typename, {
+                      F: __dxlog_file,
+                      L: 347,
+                      S: void 0,
+                      C: (f, a) => f(...a)
+                    });
+                    return;
+                  }
+                }
+                const subjectId = (0, import_echo2.fullyQualifiedId)(subject);
+                const thread = (0, import_echo.create)(import_types.ThreadType, {
                   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
                   ];
                 }
@@ -736,25 +848,27 @@ var ThreadPlugin = () => {
                   intents: [
                     [
                       {
-                        action: import_app_framework.NavigationAction.OPEN,
+                        action: import_chunk_A2IORKQK.ThreadAction.SELECT,
                         data: {
-                          activeParts: {
-                            complementary: `${subjectId}${import_app_framework.SLUG_PATH_SEPARATOR}comments${import_app_framework.SLUG_COLLECTION_INDICATOR}`
-                          }
+                          current: (0, import_echo2.fullyQualifiedId)(thread)
                         }
-                      },
+                      }
+                    ],
+                    [
                       {
-                        action: import_chunk_D5GOVXHS.ThreadAction.SELECT,
+                        action: import_app_framework.NavigationAction.OPEN,
                         data: {
-                          current: thread.id,
-                          focus: true
+                          activeParts: {
+                            complementary: "comments"
+                          }
                         }
-                      },
+                      }
+                    ],
+                    [
                       {
                         action: import_app_framework.LayoutAction.SET_LAYOUT,
                         data: {
                           element: "complementary",
-                          subject: subjectId,
                           state: true
                         }
                       }
@@ -763,9 +877,9 @@ var ThreadPlugin = () => {
                 };
               } else {
                 return {
-                  data: (0, import_echo_schema2.create)(import_types2.ChannelType, {
+                  data: (0, import_echo.create)(import_types.ChannelType, {
                     threads: [
-                      (0, import_echo_schema2.create)(import_types2.ThreadType, {
+                      (0, import_echo.create)(import_types.ThreadType, {
                         messages: []
                       })
                     ]
@@ -773,16 +887,27 @@ var ThreadPlugin = () => {
                 };
               }
             }
-            case import_chunk_D5GOVXHS.ThreadAction.SELECT: {
-              state.focus = intent.data?.current === state.current ? state.focus : intent.data?.focus;
+            case import_chunk_A2IORKQK.ThreadAction.SELECT: {
               state.current = intent.data?.current;
               return {
-                data: true
+                data: true,
+                intents: !intent.data?.skipOpen ? [
+                  [
+                    {
+                      action: import_app_framework.NavigationAction.OPEN,
+                      data: {
+                        activeParts: {
+                          complementary: "comments"
+                        }
+                      }
+                    }
+                  ]
+                ] : []
               };
             }
-            case import_chunk_D5GOVXHS.ThreadAction.TOGGLE_RESOLVED: {
+            case import_chunk_A2IORKQK.ThreadAction.TOGGLE_RESOLVED: {
               const { thread } = intent.data ?? {};
-              if (!(thread instanceof import_types2.ThreadType)) {
+              if (!(thread instanceof import_types.ThreadType)) {
                 return;
               }
               if (thread.status === "active" || thread.status === void 0) {
@@ -790,9 +915,10 @@ var ThreadPlugin = () => {
               } else if (thread.status === "resolved") {
                 thread.status = "active";
               }
-              const space = (0, import_echo.getSpace)(thread);
+              const space = (0, import_echo2.getSpace)(thread);
               const spaceId = space?.id;
               return {
+                data: true,
                 intents: [
                   [
                     {
@@ -809,21 +935,23 @@ var ThreadPlugin = () => {
                 ]
               };
             }
-            case import_chunk_D5GOVXHS.ThreadAction.DELETE: {
+            case import_chunk_A2IORKQK.ThreadAction.DELETE: {
               const { subject, thread } = intent.data ?? {};
-              if (!(subject instanceof import_types.DocumentType) || !(thread instanceof import_types2.ThreadType)) {
+              if (!(thread instanceof import_types.ThreadType) || !(subject && typeof subject === "object" && "threads" in subject)) {
                 return;
               }
-              const subjectId = (0, import_echo.fullyQualifiedId)(subject);
-              const stagingArea = state.staging[subjectId];
-              if (stagingArea) {
-                const index = stagingArea.findIndex((t) => t.id === thread.id);
+              const subjectId = (0, import_echo2.fullyQualifiedId)(subject);
+              const draft = state.drafts[subjectId];
+              if (draft) {
+                const index = draft.findIndex((t) => t.id === thread.id);
                 if (index !== -1) {
-                  stagingArea.splice(index, 1);
-                  return;
+                  draft.splice(index, 1);
+                  return {
+                    data: true
+                  };
                 }
               }
-              const space = (0, import_echo.getSpace)(thread);
+              const space = (0, import_echo2.getSpace)(thread);
               if (!space || !subject.threads) {
                 return;
               }
@@ -836,7 +964,7 @@ var ThreadPlugin = () => {
                 space.db.remove(thread);
                 return {
                   undoable: {
-                    message: translations_default[0]["en-US"][import_chunk_BWBONZGU.THREAD_PLUGIN]["thread deleted label"],
+                    message: translations_default[0]["en-US"][import_chunk_JIJ7Z6NO.THREAD_PLUGIN]["thread deleted label"],
                     data: {
                       cursor
                     }
@@ -879,24 +1007,24 @@ var ThreadPlugin = () => {
               }
               break;
             }
-            case import_chunk_D5GOVXHS.ThreadAction.ON_MESSAGE_ADD: {
+            case import_chunk_A2IORKQK.ThreadAction.ON_MESSAGE_ADD: {
               const { thread, subject } = intent.data ?? {};
-              if (!(thread instanceof import_types2.ThreadType) || !(subject && typeof subject === "object" && "threads" in subject)) {
+              if (!(thread instanceof import_types.ThreadType) || !(subject && typeof subject === "object" && "threads" in subject && Array.isArray(subject.threads))) {
                 return;
               }
-              const subjectId = (0, import_echo.fullyQualifiedId)(subject);
-              const space = (0, import_echo.getSpace)(subject);
+              const subjectId = (0, import_echo2.fullyQualifiedId)(subject);
+              const space = (0, import_echo2.getSpace)(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: import_meta.ObservabilityAction.SEND_EVENT,
                   data: {
@@ -922,10 +1050,10 @@ var ThreadPlugin = () => {
                 ]
               };
             }
-            case import_chunk_D5GOVXHS.ThreadAction.DELETE_MESSAGE: {
+            case import_chunk_A2IORKQK.ThreadAction.DELETE_MESSAGE: {
               const { subject, thread, messageId } = intent.data ?? {};
-              const space = (0, import_echo.getSpace)(subject);
-              if (!(subject instanceof import_types.DocumentType) || !(thread instanceof import_types2.ThreadType) || !space) {
+              const space = (0, import_echo2.getSpace)(subject);
+              if (!(thread instanceof import_types.ThreadType) || !(subject && typeof subject === "object" && "threads" in subject)) {
                 return;
               }
               if (!intent.undo) {
@@ -939,7 +1067,7 @@ var ThreadPlugin = () => {
                     intents: [
                       [
                         {
-                          action: import_chunk_D5GOVXHS.ThreadAction.DELETE,
+                          action: import_chunk_A2IORKQK.ThreadAction.DELETE,
                           data: {
                             subject,
                             thread
@@ -953,7 +1081,7 @@ var ThreadPlugin = () => {
                 }
                 return {
                   undoable: {
-                    message: translations_default[0]["en-US"][import_chunk_BWBONZGU.THREAD_PLUGIN]["message deleted label"],
+                    message: translations_default[0]["en-US"][import_chunk_JIJ7Z6NO.THREAD_PLUGIN]["message deleted label"],
                     data: {
                       message,
                       messageIndex
@@ -967,7 +1095,7 @@ var ThreadPlugin = () => {
                           name: "threads.message.delete",
                           properties: {
                             threadId: thread.id,
-                            spaceId: space.id
+                            spaceId: space?.id
                           }
                         }
                       }
@@ -977,7 +1105,7 @@ var ThreadPlugin = () => {
               } else if (intent.undo) {
                 const message = intent.data?.message;
                 const messageIndex = intent.data?.messageIndex;
-                if (!(message instanceof import_types2.MessageType) || !(typeof messageIndex === "number")) {
+                if (!(message instanceof import_types.MessageType) || !(typeof messageIndex === "number")) {
                   return;
                 }
                 thread.messages.splice(messageIndex, 0, message);
@@ -991,7 +1119,7 @@ var ThreadPlugin = () => {
                           name: "threads.message.undo-delete",
                           properties: {
                             threadId: thread.id,
-                            spaceId: space.id
+                            spaceId: space?.id
                           }
                         }
                       }
@@ -1004,92 +1132,8 @@ var ThreadPlugin = () => {
         }
       },
       markdown: {
-        // TODO(burdon): Factor out extension factory into separate file (for simplicity).
         extensions: ({ document: doc }) => {
-          const space = doc && (0, import_echo.getSpace)(doc);
-          if (!doc || !space) {
-            return [
-              (0, import_react_ui_editor.comments)()
-            ];
-          }
-          const threads = (0, import_signals_core.computed)(() => [
-            ...doc.threads.filter(import_util.nonNullable),
-            ...state.staging[(0, import_echo.fullyQualifiedId)(doc)] ?? []
-          ].filter((thread) => !(thread?.status === "resolved")));
-          return [
-            (0, import_react_ui_editor.listener)({
-              onChange: () => {
-                doc.threads.forEach((thread) => {
-                  if (thread?.anchor) {
-                    const [start, end] = thread.anchor.split(":");
-                    const name = doc.content && (0, import_echo.getTextInRange)((0, import_echo.createDocAccessor)(doc.content, [
-                      "content"
-                    ]), start, end);
-                    if (name && name !== thread.name) {
-                      thread.name = name;
-                    }
-                  }
-                });
-              }
-            }),
-            (0, import_react_ui_editor.createExternalCommentSync)(doc.id, (sink) => (0, import_signals_core.effect)(() => sink()), () => threads.value.filter((thread) => thread?.anchor).map((thread) => ({
-              id: thread.id,
-              cursor: thread.anchor
-            }))),
-            (0, import_react_ui_editor.comments)({
-              id: doc.id,
-              onCreate: ({ cursor }) => {
-                const [start, end] = cursor.split(":");
-                const name = doc.content && (0, import_echo.getTextInRange)((0, import_echo.createDocAccessor)(doc.content, [
-                  "content"
-                ]), start, end);
-                void intentPlugin?.provides.intent.dispatch({
-                  action: import_chunk_D5GOVXHS.ThreadAction.CREATE,
-                  data: {
-                    cursor,
-                    name,
-                    subject: doc
-                  }
-                });
-              },
-              onDelete: ({ id }) => {
-                const stagingArea = state.staging[(0, import_echo.fullyQualifiedId)(doc)];
-                if (stagingArea) {
-                  const index = stagingArea.findIndex((thread2) => thread2.id === 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[(0, import_echo.fullyQualifiedId)(doc)]?.find((thread2) => thread2.id === id) ?? doc.threads.find((thread2) => thread2?.id === id);
-                if (thread instanceof import_types2.ThreadType && thread.anchor) {
-                  const [start, end] = thread.anchor.split(":");
-                  thread.name = doc.content && (0, import_echo.getTextInRange)((0, import_echo.createDocAccessor)(doc.content, [
-                    "content"
-                  ]), start, end);
-                  thread.anchor = cursor;
-                }
-              },
-              onSelect: ({ selection: { current, closest } }) => {
-                const dispatch2 = intentPlugin?.provides.intent.dispatch;
-                if (dispatch2) {
-                  void dispatch2([
-                    {
-                      action: import_chunk_D5GOVXHS.ThreadAction.SELECT,
-                      data: {
-                        current: current ?? closest
-                      }
-                    }
-                  ]);
-                }
-              }
-            })
-          ];
+          return threads(state, doc, intentPlugin?.provides.intent.dispatch);
         }
       }
     }