@dxos/plugin-thread 0.6.12-main.15a606f → 0.6.12-main.2d19bf1

package/dist/lib/node/index.cjs

@@ -28,18 +28,17 @@ 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_FXD3DYMO.ThreadAction,
+  ThreadAction: () => import_chunk_FOZUQZF4.ThreadAction,
   ThreadPlugin: () => ThreadPlugin,
   default: () => src_default,
-  useAnalyticsCallback: () => import_chunk_PZVUW4W2.useAnalyticsCallback,
-  useOnEditAnalytics: () => import_chunk_PZVUW4W2.useOnEditAnalytics,
-  useStatus: () => import_chunk_PZVUW4W2.useStatus
+  useAnalyticsCallback: () => import_chunk_FDYRG7HE.useAnalyticsCallback,
+  useOnEditAnalytics: () => import_chunk_FDYRG7HE.useOnEditAnalytics,
+  useStatus: () => import_chunk_FDYRG7HE.useStatus
 });
 module.exports = __toCommonJS(node_exports);
-var import_chunk_FXD3DYMO = require("./chunk-FXD3DYMO.cjs");
-var import_chunk_PZVUW4W2 = require("./chunk-PZVUW4W2.cjs");
-var import_chunk_6EVXCSDS = require("./chunk-6EVXCSDS.cjs");
-var import_signals_core = require("@preact/signals-core");
+var import_chunk_FOZUQZF4 = require("./chunk-FOZUQZF4.cjs");
+var import_chunk_FDYRG7HE = require("./chunk-FDYRG7HE.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");
@@ -52,9 +51,7 @@ var import_meta = require("@dxos/plugin-observability/meta");
 var import_plugin_space = require("@dxos/plugin-space");
 var import_types = require("@dxos/plugin-space/types");
 var import_echo = require("@dxos/react-client/echo");
-var import_react_ui_editor = require("@dxos/react-ui-editor");
 var import_react_ui_thread = require("@dxos/react-ui-thread");
-var import_util = require("@dxos/util");
 var import_react2 = __toESM(require("react"));
 var import_react3 = __toESM(require("react"));
 var import_plugin_settings = require("@dxos/plugin-settings");
@@ -66,24 +63,29 @@ var import_types2 = require("@dxos/plugin-space/types");
 var import_echo2 = require("@dxos/react-client/echo");
 var import_halo = require("@dxos/react-client/halo");
 var import_react_ui2 = require("@dxos/react-ui");
-var import_react_ui_editor2 = require("@dxos/react-ui-editor");
+var import_react_ui_editor = 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_util2 = require("@dxos/util");
+var import_util = require("@dxos/util");
 var import_react6 = require("@phosphor-icons/react");
 var import_react7 = __toESM(require("react"));
 var import_echo3 = require("@dxos/react-client/echo");
 var import_react_ui3 = 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 import_react8 = __toESM(require("react"));
 var import_app_framework2 = require("@dxos/app-framework");
 var import_echo4 = require("@dxos/react-client/echo");
 var import_react_ui4 = require("@dxos/react-ui");
 var import_react_ui_attention = require("@dxos/react-ui-attention");
+var import_util2 = require("@dxos/util");
+var import_view = require("@codemirror/view");
+var import_signals_core = require("@preact/signals-core");
+var import_types3 = require("@dxos/plugin-space/types");
+var import_echo5 = require("@dxos/react-client/echo");
+var import_react_ui_editor2 = require("@dxos/react-ui-editor");
 var import_util3 = require("@dxos/util");
 var ThreadSettings = ({ settings }) => {
-  const { t } = (0, import_react_ui.useTranslation)(import_chunk_6EVXCSDS.THREAD_PLUGIN);
+  const { t } = (0, import_react_ui.useTranslation)(import_chunk_JIJ7Z6NO.THREAD_PLUGIN);
   return /* @__PURE__ */ import_react3.default.createElement(import_react3.default.Fragment, null, /* @__PURE__ */ import_react3.default.createElement(import_plugin_settings.SettingsValue, {
     label: t("settings standalone label")
   }, /* @__PURE__ */ import_react3.default.createElement(import_react_ui.Input.Switch, {
@@ -93,7 +95,7 @@ var ThreadSettings = ({ settings }) => {
 };
 var sizeClass = (0, import_react_ui_theme.getSize)(4);
 var ToggleResolvedButton = ({ isResolved, onResolve }) => {
-  const { t } = (0, import_react_ui2.useTranslation)(import_chunk_6EVXCSDS.THREAD_PLUGIN);
+  const { t } = (0, import_react_ui2.useTranslation)(import_chunk_JIJ7Z6NO.THREAD_PLUGIN);
   const label = t(isResolved ? "mark as unresolved label" : "mark as resolved label");
   return /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.Tooltip.Root, null, /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.Tooltip.Trigger, {
     asChild: true
@@ -117,7 +119,7 @@ var ToggleResolvedButton = ({ isResolved, onResolve }) => {
   }, label, /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.Tooltip.Arrow, null))));
 };
 var DeleteThreadButton = ({ onDelete }) => {
-  const { t } = (0, import_react_ui2.useTranslation)(import_chunk_6EVXCSDS.THREAD_PLUGIN);
+  const { t } = (0, import_react_ui2.useTranslation)(import_chunk_JIJ7Z6NO.THREAD_PLUGIN);
   const label = t("delete thread label");
   return /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.Tooltip.Root, null, /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.Tooltip.Trigger, {
     asChild: true
@@ -137,38 +139,32 @@ var DeleteThreadButton = ({ onDelete }) => {
     classNames: "z-[21]"
   }, label, /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.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_PZVUW4W2.useStatus)(space, (0, import_echo2.fullyQualifiedId)(thread));
-  const { t } = (0, import_react_ui2.useTranslation)(import_chunk_6EVXCSDS.THREAD_PLUGIN);
+  const activity = (0, import_chunk_FDYRG7HE.useStatus)(space, (0, import_echo2.fullyQualifiedId)(thread));
+  const { t } = (0, import_react_ui2.useTranslation)(import_chunk_JIJ7Z6NO.THREAD_PLUGIN);
   const threadScrollRef = (0, import_react5.useRef)(null);
-  const [autoFocus, setAutoFocus] = (0, import_react5.useState)(!!autoFocusTextbox);
   const { themeMode } = (0, import_react_ui2.useThemeContext)();
-  const textboxMetadata = (0, import_chunk_PZVUW4W2.getMessageMetadata)((0, import_echo2.fullyQualifiedId)(thread), identity);
+  const textboxMetadata = (0, import_chunk_FDYRG7HE.getMessageMetadata)((0, import_echo2.fullyQualifiedId)(thread), identity);
   const [_count, _setCount] = (0, import_react5.useState)(0);
   const rerenderEditor = () => _setCount((count) => count + 1);
   const messageRef = (0, import_react5.useRef)("");
   const extensions = (0, import_react5.useMemo)(() => [
-    (0, import_react_ui_editor2.createBasicExtensions)({
+    (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_PZVUW4W2.command
+    import_chunk_FDYRG7HE.command
   ], [
     _count
   ]);
-  (0, import_react5.useEffect)(() => {
-    setAutoFocus(!!autoFocusTextbox);
-  }, [
-    autoFocusTextbox
-  ]);
   const scrollToEnd = (behavior) => setTimeout(() => threadScrollRef.current?.scrollIntoView({
     behavior,
     block: "end"
@@ -187,7 +183,6 @@ var CommentContainer = ({ thread, detached, context, current, autoFocusTextbox,
     }));
     onComment?.(thread);
     messageRef.current = "";
-    setAutoFocus(true);
     scrollToEnd("instant");
     rerenderEditor();
     return true;
@@ -219,14 +214,13 @@ var CommentContainer = ({ thread, detached, context, current, autoFocusTextbox,
     onResolve
   }), onThreadDelete && /* @__PURE__ */ import_react5.default.createElement(DeleteThreadButton, {
     onDelete: onThreadDelete
-  }))), thread.messages.filter(import_util2.nonNullable).map((message) => /* @__PURE__ */ import_react5.default.createElement(import_chunk_PZVUW4W2.MessageContainer, {
+  }))), thread.messages.filter(import_util.nonNullable).map((message) => /* @__PURE__ */ import_react5.default.createElement(import_chunk_FDYRG7HE.MessageContainer, {
     key: message.id,
     message,
     members,
     onDelete: (id) => onMessageDelete?.(id)
   })), /* @__PURE__ */ import_react5.default.createElement(import_react_ui_thread2.MessageTextbox, {
     extensions,
-    autoFocus,
     onSend: handleCreate,
     ...textboxMetadata
   }), /* @__PURE__ */ import_react5.default.createElement(import_react_ui_thread2.ThreadFooter, {
@@ -237,23 +231,9 @@ var CommentContainer = ({ thread, detached, context, current, autoFocusTextbox,
     ref: threadScrollRef
   }));
 };
-var CommentsHeading = ({ attendableId }) => {
-  const { t } = (0, import_react_ui3.useTranslation)(import_chunk_6EVXCSDS.THREAD_PLUGIN);
-  return /* @__PURE__ */ import_react7.default.createElement("div", {
-    role: "none",
-    className: "flex items-center"
-  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui_deck.PlankHeading.Button, {
-    attendableId
-  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui3.Icon, {
-    icon: "ph--quotes--regular",
-    size: 5
-  })), /* @__PURE__ */ import_react7.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_ui3.useTranslation)(import_chunk_6EVXCSDS.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 } = (0, import_react_ui3.useTranslation)(import_chunk_JIJ7Z6NO.THREAD_PLUGIN);
+  const filteredThreads = showResolvedThreads ? threads2 : threads2.filter((thread) => !(thread?.status === "resolved"));
   (0, import_react7.useEffect)(() => {
     if (currentId) {
       document.getElementById(currentId)?.scrollIntoView({
@@ -271,7 +251,6 @@ var CommentsContainer = ({ threads, detached = [], currentId, autoFocusCurrentTe
       thread,
       current: currentId === threadId,
       detached: detached.includes(threadId),
-      autoFocusTextbox: autoFocusCurrentTextbox && currentId === threadId,
       ...onThreadAttend && {
         onAttend: () => onThreadAttend(thread)
       },
@@ -301,10 +280,10 @@ var CommentsContainer = ({ threads, detached = [], currentId, autoFocusCurrentTe
     }
   }))));
 };
-var ThreadMain = import_react2.default.lazy(() => import("./ThreadMain-6DN7FDNB.cjs"));
-var ThreadArticle = import_react2.default.lazy(() => import("./ThreadArticle-ERUHPHVT.cjs"));
+var ThreadMain = import_react2.default.lazy(() => import("./ThreadMain-CO6I3DNX.cjs"));
+var ThreadArticle = import_react2.default.lazy(() => import("./ThreadArticle-GH5UBWFU.cjs"));
 var providesThreadsConfig = (plugin) => "thread" in plugin.provides ? plugin : void 0;
-var ThreadComplementary = ({ role, subject, stagedThreads, current, focus, showResolvedThreads }) => {
+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_react8.useMemo)(() => threadsIntegrators.map((p) => p.provides.thread), [
@@ -318,42 +297,37 @@ var ThreadComplementary = ({ role, subject, stagedThreads, current, focus, showR
     createSort,
     subject
   ]);
-  const threads = (0, import_react8.useMemo)(() => {
-    return subject.threads.concat(stagedThreads ?? []).filter(import_util3.nonNullable);
+  const threads2 = (0, import_react8.useMemo)(() => {
+    return subject.threads.concat(drafts ?? []).filter(import_util2.nonNullable);
   }, [
     JSON.stringify(subject.threads),
-    JSON.stringify(stagedThreads)
+    JSON.stringify(drafts)
   ]);
   const detachedIds = (0, import_react8.useMemo)(() => {
-    return threads.filter(({ anchor }) => !anchor).map((thread) => (0, import_echo4.fullyQualifiedId)(thread));
+    return threads2.filter(({ anchor }) => !anchor).map((thread) => (0, import_echo4.fullyQualifiedId)(thread));
   }, [
-    threads
+    threads2
   ]);
   (0, import_react8.useEffect)(() => {
     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 } = (0, import_react_ui_attention.useAttentionContext)("Thread Complementary");
+  const attended = (0, import_react_ui_attention.useAttended)();
   const qualifiedSubjectId = (0, import_echo4.fullyQualifiedId)(subject);
-  const attendableAttrs = (0, import_react_ui_attention.createAttendableAttributes)(qualifiedSubjectId);
   return /* @__PURE__ */ import_react8.default.createElement("div", {
     role: "none",
-    className: "contents group/attention",
-    ...attendableAttrs
-  }, role === "complementary" && /* @__PURE__ */ import_react8.default.createElement(CommentsHeading, {
-    attendableId: qualifiedSubjectId
-  }), /* @__PURE__ */ import_react8.default.createElement(import_react_ui4.ScrollArea.Root, {
+    className: "contents"
+  }, /* @__PURE__ */ import_react8.default.createElement(import_react_ui4.ScrollArea.Root, {
     classNames: "row-span-2"
   }, /* @__PURE__ */ import_react8.default.createElement(import_react_ui4.ScrollArea.Viewport, null, /* @__PURE__ */ import_react8.default.createElement(CommentsContainer, {
-    threads,
+    threads: threads2,
     detached: detachedIds,
-    currentId: attended.has(qualifiedSubjectId) ? current : void 0,
-    autoFocusCurrentTextbox: focus,
+    currentId: attended.includes(qualifiedSubjectId) ? current : void 0,
     showResolvedThreads,
     onThreadAttend: (thread) => {
       const threadId = (0, import_echo4.fullyQualifiedId)(thread);
@@ -373,8 +347,8 @@ var ThreadComplementary = ({ role, subject, stagedThreads, current, focus, showR
     },
     onThreadDelete: (thread) => {
       return dispatch({
-        plugin: import_chunk_6EVXCSDS.THREAD_PLUGIN,
-        action: import_chunk_FXD3DYMO.ThreadAction.DELETE,
+        plugin: import_chunk_JIJ7Z6NO.THREAD_PLUGIN,
+        action: import_chunk_FOZUQZF4.ThreadAction.DELETE,
         data: {
           subject,
           thread
@@ -382,8 +356,8 @@ var ThreadComplementary = ({ role, subject, stagedThreads, current, focus, showR
       });
     },
     onMessageDelete: (thread, messageId) => dispatch({
-      plugin: import_chunk_6EVXCSDS.THREAD_PLUGIN,
-      action: import_chunk_FXD3DYMO.ThreadAction.DELETE_MESSAGE,
+      plugin: import_chunk_JIJ7Z6NO.THREAD_PLUGIN,
+      action: import_chunk_FOZUQZF4.ThreadAction.DELETE_MESSAGE,
       data: {
         subject,
         thread,
@@ -391,15 +365,15 @@ var ThreadComplementary = ({ role, subject, stagedThreads, current, focus, showR
       }
     }),
     onThreadToggleResolved: (thread) => dispatch({
-      plugin: import_chunk_6EVXCSDS.THREAD_PLUGIN,
-      action: import_chunk_FXD3DYMO.ThreadAction.TOGGLE_RESOLVED,
+      plugin: import_chunk_JIJ7Z6NO.THREAD_PLUGIN,
+      action: import_chunk_FOZUQZF4.ThreadAction.TOGGLE_RESOLVED,
       data: {
         thread
       }
     }),
     onComment: (thread) => {
       void dispatch({
-        action: import_chunk_FXD3DYMO.ThreadAction.ON_MESSAGE_ADD,
+        action: import_chunk_FOZUQZF4.ThreadAction.ON_MESSAGE_ADD,
         data: {
           thread,
           subject
@@ -411,10 +385,91 @@ var ThreadComplementary = ({ role, subject, stagedThreads, current, focus, showR
     className: "bs-10"
   }), /* @__PURE__ */ import_react8.default.createElement(import_react_ui4.ScrollArea.Scrollbar, null, /* @__PURE__ */ import_react8.default.createElement(import_react_ui4.ScrollArea.Thumb, null)))));
 };
+var getName = (doc, anchor) => {
+  if (doc.content) {
+    const [start, end] = anchor.split(":");
+    return (0, import_echo5.getTextInRange)((0, import_echo5.createDocAccessor)(doc.content, [
+      "content"
+    ]), start, end);
+  }
+};
+var threads = (state, doc, dispatch) => {
+  const space = doc && (0, import_echo5.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_echo5.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_echo5.fullyQualifiedId)(doc), (sink) => (0, import_signals_core.effect)(() => sink()), () => threads2.value.filter((thread) => thread?.anchor).map((thread) => ({
+      id: (0, import_echo5.fullyQualifiedId)(thread),
+      cursor: thread.anchor
+    }))),
+    (0, import_react_ui_editor2.comments)({
+      id: (0, import_echo5.fullyQualifiedId)(doc),
+      onCreate: ({ cursor }) => {
+        const name = getName(doc, cursor);
+        void dispatch({
+          action: import_chunk_FOZUQZF4.ThreadAction.CREATE,
+          data: {
+            cursor,
+            name,
+            subject: doc
+          }
+        });
+      },
+      onDelete: ({ id }) => {
+        const draft = state.drafts[(0, import_echo5.fullyQualifiedId)(doc)];
+        if (draft) {
+          const index = draft.findIndex((thread2) => (0, import_echo5.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_echo5.fullyQualifiedId)(doc)]?.find((thread2) => (0, import_echo5.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_FOZUQZF4.ThreadAction.SELECT,
+          data: {
+            current: current ?? closest,
+            skipOpen: true
+          }
+        });
+      }
+    })
+  ];
+};
 var translations_default = [
   {
     "en-US": {
-      [import_chunk_6EVXCSDS.THREAD_PLUGIN]: {
+      [import_chunk_JIJ7Z6NO.THREAD_PLUGIN]: {
         "plugin name": "Threads",
         "channel name placeholder": "New channel",
         "channel title label": "Title",
@@ -450,9 +505,9 @@ var initialViewState = {
   showResolvedThreads: false
 };
 var ThreadPlugin = () => {
-  const settings = new import_local_storage.LocalStorageStore(import_chunk_6EVXCSDS.THREAD_PLUGIN);
+  const settings = new import_local_storage.LocalStorageStore(import_chunk_JIJ7Z6NO.THREAD_PLUGIN);
   const state = (0, import_echo_schema2.create)({
-    staging: {}
+    drafts: {}
   });
   const viewStore = (0, import_echo_schema2.create)({});
   const getViewState = (subjectId) => {
@@ -467,7 +522,7 @@ var ThreadPlugin = () => {
   let intentPlugin;
   const unsubscribeCallbacks = [];
   return {
-    meta: import_chunk_6EVXCSDS.meta_default,
+    meta: import_chunk_JIJ7Z6NO.meta_default,
     ready: async (plugins) => {
       settings.prop({
         key: "standalone",
@@ -489,7 +544,7 @@ var ThreadPlugin = () => {
             placeholder: [
               "channel title placeholder",
               {
-                ns: import_chunk_6EVXCSDS.THREAD_PLUGIN
+                ns: import_chunk_JIJ7Z6NO.THREAD_PLUGIN
               }
             ],
             icon: "ph--chat--regular",
@@ -504,7 +559,7 @@ var ThreadPlugin = () => {
             // TODO(wittjosiah): Move out of metadata.
             loadReferences: (message) => []
           },
-          [import_chunk_6EVXCSDS.THREAD_ITEM]: {
+          [import_chunk_JIJ7Z6NO.THREAD_ITEM]: {
             parse: (item, type) => {
               switch (type) {
                 case "node":
@@ -546,7 +601,7 @@ var ThreadPlugin = () => {
           }
           return [
             (0, import_plugin_graph.createExtension)({
-              id: `${import_chunk_6EVXCSDS.THREAD_PLUGIN}/comments-for-subject`,
+              id: `${import_chunk_JIJ7Z6NO.THREAD_PLUGIN}/comments-for-subject`,
               resolver: ({ id }) => {
                 if (!id.endsWith("~comments")) {
                   return;
@@ -560,7 +615,7 @@ var ThreadPlugin = () => {
                     onChange();
                   });
                   return () => clearTimeout(timeout);
-                }, () => space?.db.getObjectById(objectId));
+                }, () => space?.db.getObjectById(objectId), subjectId);
                 if (!object || !subjectId) {
                   return;
                 }
@@ -568,18 +623,19 @@ var ThreadPlugin = () => {
                 const label = meta.label?.(object) || object.name || meta.placeholder || [
                   "unnamed object threads label",
                   {
-                    ns: import_chunk_6EVXCSDS.THREAD_PLUGIN
+                    ns: import_chunk_JIJ7Z6NO.THREAD_PLUGIN
                   }
                 ];
                 const viewState = getViewState(subjectId);
                 return {
                   id,
                   type: "orphan-comments-for-subject",
-                  data: object,
+                  data: null,
                   properties: {
-                    icon: meta.icon,
+                    icon: "ph--chat-text--regular",
                     label,
-                    showResolvedThreads: viewState.showResolvedThreads
+                    showResolvedThreads: viewState.showResolvedThreads,
+                    object
                   }
                 };
               },
@@ -607,13 +663,13 @@ var ThreadPlugin = () => {
                 };
                 return [
                   {
-                    id: `${import_chunk_6EVXCSDS.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_6EVXCSDS.THREAD_PLUGIN
+                          ns: import_chunk_JIJ7Z6NO.THREAD_PLUGIN
                         }
                       ],
                       menuItemType: "toggle",
@@ -626,7 +682,7 @@ var ThreadPlugin = () => {
               }
             }),
             (0, import_plugin_graph.createExtension)({
-              id: import_chunk_FXD3DYMO.ThreadAction.CREATE,
+              id: import_chunk_FOZUQZF4.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);
@@ -639,12 +695,12 @@ var ThreadPlugin = () => {
                 }
                 return [
                   {
-                    id: `${import_chunk_6EVXCSDS.THREAD_PLUGIN}/create/${node.id}`,
+                    id: `${import_chunk_JIJ7Z6NO.THREAD_PLUGIN}/create/${node.id}`,
                     data: async () => {
                       await dispatch([
                         {
-                          plugin: import_chunk_6EVXCSDS.THREAD_PLUGIN,
-                          action: import_chunk_FXD3DYMO.ThreadAction.CREATE
+                          plugin: import_chunk_JIJ7Z6NO.THREAD_PLUGIN,
+                          action: import_chunk_FOZUQZF4.ThreadAction.CREATE
                         },
                         {
                           action: import_plugin_space.SpaceAction.ADD_OBJECT,
@@ -661,7 +717,7 @@ var ThreadPlugin = () => {
                       label: [
                         "create channel label",
                         {
-                          ns: import_chunk_6EVXCSDS.THREAD_PLUGIN
+                          ns: import_chunk_JIJ7Z6NO.THREAD_PLUGIN
                         }
                       ],
                       icon: "ph--chat--regular",
@@ -683,12 +739,11 @@ var ThreadPlugin = () => {
               }) : null;
             }
             case "settings": {
-              return data.plugin === import_chunk_6EVXCSDS.meta_default.id ? /* @__PURE__ */ import_react.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;
               if (data.object instanceof import_types.ChannelType && data.object.threads[0]) {
                 const channel = data.object;
@@ -709,23 +764,26 @@ var ThreadPlugin = () => {
                 });
               }
               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_PZVUW4W2.ChatHeading, {
+                return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_chunk_FDYRG7HE.ChatHeading, {
                   attendableId: data.subject.id
-                }), /* @__PURE__ */ import_react.default.createElement(import_chunk_PZVUW4W2.ChatContainer, {
+                }), /* @__PURE__ */ import_react.default.createElement(import_chunk_FDYRG7HE.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((0, import_echo.fullyQualifiedId)(data.subject));
                 return /* @__PURE__ */ import_react.default.createElement(ThreadComplementary, {
                   role,
                   subject: data.subject,
-                  stagedThreads: state.staging[(0, import_echo.fullyQualifiedId)(data.subject)],
+                  drafts: state.drafts[(0, import_echo.fullyQualifiedId)(data.subject)],
                   current: state.current,
-                  focus: true,
                   showResolvedThreads
                 });
               }
+              break;
             }
           }
           return null;
@@ -734,16 +792,16 @@ var ThreadPlugin = () => {
       intent: {
         resolver: async (intent) => {
           switch (intent.action) {
-            case import_chunk_FXD3DYMO.ThreadAction.CREATE: {
+            case import_chunk_FOZUQZF4.ThreadAction.CREATE: {
               if (intent.data && intent.data.cursor !== void 0) {
                 const { cursor, name, subject } = intent.data;
                 if (subject?.threads === void 0) {
                   try {
                     subject.threads = [];
-                  } catch (e) {
+                  } catch (err) {
                     import_log.log.error("Subject does not support threads array", subject?.typename, {
                       F: __dxlog_file,
-                      L: 331,
+                      L: 322,
                       S: void 0,
                       C: (f, a) => f(...a)
                     });
@@ -757,11 +815,11 @@ var ThreadPlugin = () => {
                   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
                   ];
                 }
@@ -770,18 +828,19 @@ var ThreadPlugin = () => {
                   intents: [
                     [
                       {
-                        action: import_chunk_FXD3DYMO.ThreadAction.SELECT,
+                        action: import_chunk_FOZUQZF4.ThreadAction.SELECT,
                         data: {
-                          current: (0, import_echo.fullyQualifiedId)(thread),
-                          focus: true
+                          current: (0, import_echo.fullyQualifiedId)(thread)
                         }
-                      },
+                      }
+                    ],
+                    [
                       {
-                        action: import_app_framework.LayoutAction.SET_LAYOUT,
+                        action: import_app_framework.NavigationAction.OPEN,
                         data: {
-                          element: "complementary",
-                          subject: subjectId,
-                          state: true
+                          activeParts: {
+                            complementary: "comments"
+                          }
                         }
                       }
                     ]
@@ -799,14 +858,25 @@ var ThreadPlugin = () => {
                 };
               }
             }
-            case import_chunk_FXD3DYMO.ThreadAction.SELECT: {
-              state.focus = intent.data?.current === state.current ? state.focus : intent.data?.focus;
+            case import_chunk_FOZUQZF4.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_FXD3DYMO.ThreadAction.TOGGLE_RESOLVED: {
+            case import_chunk_FOZUQZF4.ThreadAction.TOGGLE_RESOLVED: {
               const { thread } = intent.data ?? {};
               if (!(thread instanceof import_types.ThreadType)) {
                 return;
@@ -819,6 +889,7 @@ var ThreadPlugin = () => {
               const space = (0, import_echo.getSpace)(thread);
               const spaceId = space?.id;
               return {
+                data: true,
                 intents: [
                   [
                     {
@@ -835,17 +906,17 @@ var ThreadPlugin = () => {
                 ]
               };
             }
-            case import_chunk_FXD3DYMO.ThreadAction.DELETE: {
+            case import_chunk_FOZUQZF4.ThreadAction.DELETE: {
               const { subject, thread } = intent.data ?? {};
               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 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
                   };
@@ -864,7 +935,7 @@ var ThreadPlugin = () => {
                 space.db.remove(thread);
                 return {
                   undoable: {
-                    message: translations_default[0]["en-US"][import_chunk_6EVXCSDS.THREAD_PLUGIN]["thread deleted label"],
+                    message: translations_default[0]["en-US"][import_chunk_JIJ7Z6NO.THREAD_PLUGIN]["thread deleted label"],
                     data: {
                       cursor
                     }
@@ -907,7 +978,7 @@ var ThreadPlugin = () => {
               }
               break;
             }
-            case import_chunk_FXD3DYMO.ThreadAction.ON_MESSAGE_ADD: {
+            case import_chunk_FOZUQZF4.ThreadAction.ON_MESSAGE_ADD: {
               const { thread, subject } = intent.data ?? {};
               if (!(thread instanceof import_types.ThreadType) || !(subject && typeof subject === "object" && "threads" in subject && Array.isArray(subject.threads))) {
                 return;
@@ -919,12 +990,12 @@ var ThreadPlugin = () => {
                 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: {
@@ -950,7 +1021,7 @@ var ThreadPlugin = () => {
                 ]
               };
             }
-            case import_chunk_FXD3DYMO.ThreadAction.DELETE_MESSAGE: {
+            case import_chunk_FOZUQZF4.ThreadAction.DELETE_MESSAGE: {
               const { subject, thread, messageId } = intent.data ?? {};
               const space = (0, import_echo.getSpace)(subject);
               if (!(thread instanceof import_types.ThreadType) || !(subject && typeof subject === "object" && "threads" in subject)) {
@@ -967,7 +1038,7 @@ var ThreadPlugin = () => {
                     intents: [
                       [
                         {
-                          action: import_chunk_FXD3DYMO.ThreadAction.DELETE,
+                          action: import_chunk_FOZUQZF4.ThreadAction.DELETE,
                           data: {
                             subject,
                             thread
@@ -981,7 +1052,7 @@ var ThreadPlugin = () => {
                 }
                 return {
                   undoable: {
-                    message: translations_default[0]["en-US"][import_chunk_6EVXCSDS.THREAD_PLUGIN]["message deleted label"],
+                    message: translations_default[0]["en-US"][import_chunk_JIJ7Z6NO.THREAD_PLUGIN]["message deleted label"],
                     data: {
                       message,
                       messageIndex
@@ -1032,92 +1103,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: (0, import_echo.fullyQualifiedId)(thread),
-              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_FXD3DYMO.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) => (0, import_echo.fullyQualifiedId)(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[(0, import_echo.fullyQualifiedId)(doc)]?.find((thread2) => (0, import_echo.fullyQualifiedId)(thread2) === id) ?? doc.threads.find((thread2) => thread2?.id === id);
-                if (thread instanceof import_types.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 dispatch = intentPlugin?.provides.intent.dispatch;
-                if (dispatch) {
-                  void dispatch([
-                    {
-                      action: import_chunk_FXD3DYMO.ThreadAction.SELECT,
-                      data: {
-                        current: current ?? closest
-                      }
-                    }
-                  ]);
-                }
-              }
-            })
-          ];
+          return threads(state, doc, intentPlugin?.provides.intent.dispatch);
         }
       }
     }