@dxos/plugin-thread 0.6.12-staging.e11e696 → 0.6.12

package/dist/lib/node/index.cjs

@@ -28,75 +28,73 @@ 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_D5GOVXHS.ThreadAction,
   ThreadPlugin: () => ThreadPlugin,
   default: () => src_default,
-  useAnalyticsCallback: () => import_chunk_PZVUW4W2.useAnalyticsCallback,
-  useOnEditAnalytics: () => import_chunk_PZVUW4W2.useOnEditAnalytics,
-  useStatus: () => import_chunk_PZVUW4W2.useStatus
+  useAnalyticsCallback: () => import_chunk_5PZNPPQF.useAnalyticsCallback,
+  useOnEditAnalytics: () => import_chunk_5PZNPPQF.useOnEditAnalytics,
+  useStatus: () => import_chunk_5PZNPPQF.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_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_react = __toESM(require("react"));
+var import_react2 = __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_log = require("@dxos/log");
+var import_plugin_attention = require("@dxos/plugin-attention");
 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_types = require("@dxos/plugin-space/types");
+var import_types2 = require("@dxos/plugin-space/types");
 var import_echo = require("@dxos/react-client/echo");
+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_util = require("@dxos/util");
-var import_react2 = __toESM(require("react"));
 var import_react3 = __toESM(require("react"));
+var import_react4 = __toESM(require("react"));
 var import_plugin_settings = require("@dxos/plugin-settings");
-var import_react_ui = require("@dxos/react-ui");
-var import_react4 = require("@phosphor-icons/react");
-var import_react5 = __toESM(require("react"));
+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_types2 = require("@dxos/plugin-space/types");
+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_react_ui2 = require("@dxos/react-ui");
+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_util2 = 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_theme2 = require("@dxos/react-ui-theme");
+var import_react7 = require("@phosphor-icons/react");
 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_util3 = require("@dxos/util");
+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_ui.useTranslation)(import_chunk_6EVXCSDS.THREAD_PLUGIN);
-  return /* @__PURE__ */ import_react3.default.createElement(import_react3.default.Fragment, null, /* @__PURE__ */ import_react3.default.createElement(import_plugin_settings.SettingsValue, {
+  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_react3.default.createElement(import_react_ui.Input.Switch, {
+  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui2.Input.Switch, {
     checked: settings.standalone,
     onCheckedChange: (checked) => settings.standalone = !!checked
   })));
 };
 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_ui3.useTranslation)(import_chunk_BWBONZGU.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, {
+  return /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Root, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Trigger, {
     asChild: true
-  }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.Button, {
+  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Button, {
     variant: "ghost",
     "data-testid": "thread.toggle-resolved",
     onClick: onResolve,
@@ -104,23 +102,23 @@ var ToggleResolvedButton = ({ isResolved, onResolve }) => {
       "min-bs-0 p-1",
       !isResolved && import_react_ui_theme.hoverableControlItem
     ]
-  }, /* @__PURE__ */ import_react5.default.createElement("span", {
+  }, /* @__PURE__ */ import_react6.default.createElement("span", {
     className: "sr-only"
-  }, label), isResolved ? /* @__PURE__ */ import_react5.default.createElement(import_react4.CheckCircle, {
+  }, label), isResolved ? /* @__PURE__ */ import_react6.default.createElement(import_react5.CheckCircle, {
     className: sizeClass,
     weight: "fill"
-  }) : /* @__PURE__ */ import_react5.default.createElement(import_react4.CheckCircle, {
+  }) : /* @__PURE__ */ import_react6.default.createElement(import_react5.CheckCircle, {
     className: sizeClass
-  }))), /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.Tooltip.Portal, null, /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.Tooltip.Content, {
+  }))), /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Portal, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Content, {
     classNames: "z-[21]"
-  }, label, /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.Tooltip.Arrow, null))));
+  }, label, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Arrow, null))));
 };
 var DeleteThreadButton = ({ onDelete }) => {
-  const { t } = (0, import_react_ui2.useTranslation)(import_chunk_6EVXCSDS.THREAD_PLUGIN);
+  const { t } = (0, import_react_ui3.useTranslation)(import_chunk_BWBONZGU.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, {
+  return /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Root, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Trigger, {
     asChild: true
-  }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.Button, {
+  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Button, {
     variant: "ghost",
     "data-testid": "thread.delete",
     onClick: onDelete,
@@ -128,27 +126,28 @@ var DeleteThreadButton = ({ onDelete }) => {
       "min-bs-0 p-1",
       import_react_ui_theme.hoverableControlItem
     ]
-  }, /* @__PURE__ */ import_react5.default.createElement("span", {
+  }, /* @__PURE__ */ import_react6.default.createElement("span", {
     className: "sr-only"
-  }, label), /* @__PURE__ */ import_react5.default.createElement(import_react4.X, {
+  }, label), /* @__PURE__ */ import_react6.default.createElement(import_react5.X, {
     className: sizeClass
-  }))), /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.Tooltip.Portal, null, /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.Tooltip.Content, {
+  }))), /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Portal, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Content, {
     classNames: "z-[21]"
-  }, label, /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.Tooltip.Arrow, null))));
+  }, label, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Arrow, null))));
 };
-var CommentContainer = ({ thread, detached, context, current, onAttend, onThreadDelete, onMessageDelete, onResolve, onComment }) => {
+var CommentContainer = ({ thread, detached, context, current, autoFocusTextbox, 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 threadScrollRef = (0, import_react5.useRef)(null);
-  const { themeMode } = (0, import_react_ui2.useThemeContext)();
-  const textboxMetadata = (0, import_chunk_PZVUW4W2.getMessageMetadata)((0, import_echo2.fullyQualifiedId)(thread), identity);
-  const [_count, _setCount] = (0, import_react5.useState)(0);
+  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 rerenderEditor = () => _setCount((count) => count + 1);
-  const messageRef = (0, import_react5.useRef)("");
-  const extensions = (0, import_react5.useMemo)(() => [
+  const messageRef = (0, import_react6.useRef)("");
+  const extensions = (0, import_react6.useMemo)(() => [
     (0, import_react_ui_editor2.createBasicExtensions)({
       placeholder: t("message placeholder")
     }),
@@ -158,19 +157,24 @@ var CommentContainer = ({ thread, detached, context, current, onAttend, onThread
     (0, import_react_ui_editor2.listener)({
       onChange: (text) => messageRef.current = text
     }),
-    import_chunk_PZVUW4W2.command
+    import_chunk_5PZNPPQF.command
   ], [
     _count
   ]);
+  (0, import_react6.useEffect)(() => {
+    setAutoFocus(!!autoFocusTextbox);
+  }, [
+    autoFocusTextbox
+  ]);
   const scrollToEnd = (behavior) => setTimeout(() => threadScrollRef.current?.scrollIntoView({
     behavior,
     block: "end"
   }), 10);
-  const handleCreate = (0, import_react5.useCallback)(() => {
+  const handleCreate = (0, import_react6.useCallback)(() => {
     if (!messageRef.current) {
       return false;
     }
-    thread.messages.push((0, import_echo_schema3.create)(import_types2.MessageType, {
+    thread.messages.push((0, import_echo_schema3.create)(import_types3.MessageType, {
       sender: {
         identityKey: identity.identityKey.toHex()
       },
@@ -180,6 +184,7 @@ var CommentContainer = ({ thread, detached, context, current, onAttend, onThread
     }));
     onComment?.(thread);
     messageRef.current = "";
+    setAutoFocus(true);
     scrollToEnd("instant");
     rerenderEditor();
     return true;
@@ -187,51 +192,64 @@ var CommentContainer = ({ thread, detached, context, current, onAttend, onThread
     thread,
     identity
   ]);
-  return /* @__PURE__ */ import_react5.default.createElement(import_react_ui_thread2.Thread, {
+  const handleDeleteMessage = (id) => onMessageDelete?.(id);
+  return /* @__PURE__ */ import_react6.default.createElement(import_react_ui_thread2.Thread, {
     onClickCapture: onAttend,
     onFocusCapture: onAttend,
     current,
-    id: (0, import_echo2.fullyQualifiedId)(thread)
-  }, /* @__PURE__ */ import_react5.default.createElement("div", {
+    id: thread.id
+  }, /* @__PURE__ */ import_react6.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_react5.default.createElement(import_react_ui2.Tooltip.Root, null, /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.Tooltip.Trigger, {
+  }, detached ? /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Root, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Trigger, {
     asChild: true
-  }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui_thread2.ThreadHeading, {
+  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui_thread2.ThreadHeading, {
     detached: true
-  }, thread.name ?? t("thread title placeholder"))), /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.Tooltip.Portal, null, /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.Tooltip.Content, {
+  }, 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, {
     classNames: "z-[21]",
     side: "top"
-  }, t("detached thread label"), /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.Tooltip.Arrow, null)))) : /* @__PURE__ */ import_react5.default.createElement(import_react_ui_thread2.ThreadHeading, null, thread.name ?? t("thread title placeholder")), /* @__PURE__ */ import_react5.default.createElement("div", {
+  }, 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", {
     className: "flex flex-row items-center pli-1"
-  }, thread.status === "staged" && /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.Tag, {
+  }, thread.status === "staged" && /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tag, {
     palette: "neutral"
-  }, t("draft button")), onResolve && !(thread?.status === "staged") && /* @__PURE__ */ import_react5.default.createElement(ToggleResolvedButton, {
+  }, t("draft button")), onResolve && !(thread?.status === "staged") && /* @__PURE__ */ import_react6.default.createElement(ToggleResolvedButton, {
     isResolved: thread?.status === "resolved",
     onResolve
-  }), onThreadDelete && /* @__PURE__ */ import_react5.default.createElement(DeleteThreadButton, {
+  }), onThreadDelete && /* @__PURE__ */ import_react6.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_util2.nonNullable).map((message) => /* @__PURE__ */ import_react6.default.createElement(import_chunk_5PZNPPQF.MessageContainer, {
     key: message.id,
     message,
     members,
-    onDelete: (id) => onMessageDelete?.(id)
-  })), /* @__PURE__ */ import_react5.default.createElement(import_react_ui_thread2.MessageTextbox, {
+    onDelete: handleDeleteMessage
+  })), /* @__PURE__ */ import_react6.default.createElement(import_react_ui_thread2.MessageTextbox, {
     extensions,
+    autoFocus,
     onSend: handleCreate,
     ...textboxMetadata
-  }), /* @__PURE__ */ import_react5.default.createElement(import_react_ui_thread2.ThreadFooter, {
+  }), /* @__PURE__ */ import_react6.default.createElement(import_react_ui_thread2.ThreadFooter, {
     activity
-  }, t("activity message")), /* @__PURE__ */ import_react5.default.createElement("div", {
+  }, t("activity message")), /* @__PURE__ */ import_react6.default.createElement("div", {
     role: "none",
     className: "bs-px -mbs-px",
     ref: threadScrollRef
   }));
 };
-var CommentsContainer = ({ threads, detached = [], currentId, showResolvedThreads, onThreadAttend, onThreadDelete, onMessageDelete, onThreadToggleResolved, ...props }) => {
-  const { t } = (0, import_react_ui3.useTranslation)(import_chunk_6EVXCSDS.THREAD_PLUGIN);
+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_react7.useEffect)(() => {
+  (0, import_react8.useEffect)(() => {
     if (currentId) {
       document.getElementById(currentId)?.scrollIntoView({
         behavior: "smooth",
@@ -241,151 +259,46 @@ var CommentsContainer = ({ threads, detached = [], currentId, showResolvedThread
   }, [
     currentId
   ]);
-  return /* @__PURE__ */ import_react7.default.createElement(import_react7.default.Fragment, null, filteredThreads.length > 0 ? filteredThreads.map((thread) => {
-    const threadId = (0, import_echo3.fullyQualifiedId)(thread);
-    return /* @__PURE__ */ import_react7.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_react7.default.createElement("div", {
+  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", {
     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_react7.default.createElement("h2", {
+  }, /* @__PURE__ */ import_react8.default.createElement("h2", {
     className: "mbe-2 font-medium text-baseText"
-  }, t("no comments title")), /* @__PURE__ */ import_react7.default.createElement("p", null, /* @__PURE__ */ import_react7.default.createElement(import_react_ui3.Trans, {
+  }, t("no comments title")), /* @__PURE__ */ import_react8.default.createElement("p", null, /* @__PURE__ */ import_react8.default.createElement(import_react_ui4.Trans, {
     t,
     i18nKey: "no comments message",
     components: {
-      commentIcon: /* @__PURE__ */ import_react7.default.createElement(import_react6.ChatText, {
+      commentIcon: /* @__PURE__ */ import_react8.default.createElement(import_react7.ChatText, {
         className: "inline-block"
       })
     }
   }))));
 };
-var ThreadMain = import_react2.default.lazy(() => import("./ThreadMain-6DN7FDNB.cjs"));
-var ThreadArticle = import_react2.default.lazy(() => import("./ThreadArticle-ERUHPHVT.cjs"));
-var providesThreadsConfig = (plugin) => "thread" in plugin.provides ? plugin : void 0;
-var ThreadComplementary = ({ role, subject, stagedThreads, 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), [
-    threadsIntegrators
-  ]);
-  const createSort = (0, import_react8.useMemo)(() => threadProvides.find((p) => p.predicate(subject))?.createSort, [
-    threadProvides,
-    subject
-  ]);
-  const sort = (0, import_react8.useMemo)(() => createSort?.(subject), [
-    createSort,
-    subject
-  ]);
-  const threads = (0, import_react8.useMemo)(() => {
-    return subject.threads.concat(stagedThreads ?? []).filter(import_util3.nonNullable);
-  }, [
-    JSON.stringify(subject.threads),
-    JSON.stringify(stagedThreads)
-  ]);
-  const detachedIds = (0, import_react8.useMemo)(() => {
-    return threads.filter(({ anchor }) => !anchor).map((thread) => (0, import_echo4.fullyQualifiedId)(thread));
-  }, [
-    threads
-  ]);
-  (0, import_react8.useEffect)(() => {
-    if (!sort) {
-      return;
-    }
-    threads.sort((a, b) => sort(a?.anchor, b?.anchor));
-  }, [
-    sort,
-    threads
-  ]);
-  const attended = (0, import_react_ui_attention.useAttended)();
-  const qualifiedSubjectId = (0, import_echo4.fullyQualifiedId)(subject);
-  return /* @__PURE__ */ import_react8.default.createElement("div", {
-    role: "none",
-    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,
-    detached: detachedIds,
-    currentId: attended.includes(qualifiedSubjectId) ? current : void 0,
-    showResolvedThreads,
-    onThreadAttend: (thread) => {
-      const threadId = (0, import_echo4.fullyQualifiedId)(thread);
-      if (current !== threadId) {
-        current = threadId;
-        void dispatch?.([
-          {
-            action: import_app_framework2.LayoutAction.SCROLL_INTO_VIEW,
-            data: {
-              id: (0, import_echo4.fullyQualifiedId)(subject),
-              thread: threadId,
-              cursor: thread.anchor
-            }
-          }
-        ]);
-      }
-    },
-    onThreadDelete: (thread) => {
-      return dispatch({
-        plugin: import_chunk_6EVXCSDS.THREAD_PLUGIN,
-        action: import_chunk_FXD3DYMO.ThreadAction.DELETE,
-        data: {
-          subject,
-          thread
-        }
-      });
-    },
-    onMessageDelete: (thread, messageId) => dispatch({
-      plugin: import_chunk_6EVXCSDS.THREAD_PLUGIN,
-      action: import_chunk_FXD3DYMO.ThreadAction.DELETE_MESSAGE,
-      data: {
-        subject,
-        thread,
-        messageId
-      }
-    }),
-    onThreadToggleResolved: (thread) => dispatch({
-      plugin: import_chunk_6EVXCSDS.THREAD_PLUGIN,
-      action: import_chunk_FXD3DYMO.ThreadAction.TOGGLE_RESOLVED,
-      data: {
-        thread
-      }
-    }),
-    onComment: (thread) => {
-      void dispatch({
-        action: import_chunk_FXD3DYMO.ThreadAction.ON_MESSAGE_ADD,
-        data: {
-          thread,
-          subject
-        }
-      });
-    }
-  }), /* @__PURE__ */ import_react8.default.createElement("div", {
-    role: "none",
-    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 ThreadMain = import_react3.default.lazy(() => import("./ThreadMain-XJX75GHG.cjs"));
+var ThreadArticle = import_react3.default.lazy(() => import("./ThreadArticle-DO56JXBU.cjs"));
 var translations_default = [
   {
     "en-US": {
-      [import_chunk_6EVXCSDS.THREAD_PLUGIN]: {
+      [import_chunk_BWBONZGU.THREAD_PLUGIN]: {
         "plugin name": "Threads",
         "channel name placeholder": "New channel",
         "channel title label": "Title",
@@ -416,12 +329,12 @@ 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_6EVXCSDS.THREAD_PLUGIN);
+  const settings = new import_local_storage.LocalStorageStore(import_chunk_BWBONZGU.THREAD_PLUGIN);
   const state = (0, import_echo_schema2.create)({
     staging: {}
   });
@@ -434,11 +347,13 @@ var ThreadPlugin = () => {
     }
     return viewStore[subjectId];
   };
+  let attentionPlugin;
   let navigationPlugin;
   let intentPlugin;
+  let dispatch;
   const unsubscribeCallbacks = [];
   return {
-    meta: import_chunk_6EVXCSDS.meta_default,
+    meta: import_chunk_BWBONZGU.meta_default,
     ready: async (plugins) => {
       settings.prop({
         key: "standalone",
@@ -446,8 +361,36 @@ 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());
@@ -456,26 +399,27 @@ var ThreadPlugin = () => {
       settings: settings.values,
       metadata: {
         records: {
-          [import_types.ChannelType.typename]: {
+          [import_types2.ChannelType.typename]: {
             placeholder: [
               "channel title placeholder",
               {
-                ns: import_chunk_6EVXCSDS.THREAD_PLUGIN
+                ns: import_chunk_BWBONZGU.THREAD_PLUGIN
               }
             ],
-            icon: "ph--chat--regular",
+            icon: (props) => /* @__PURE__ */ import_react2.default.createElement(import_react.Chat, props),
+            iconSymbol: "ph--chat--regular",
             // TODO(wittjosiah): Move out of metadata.
             loadReferences: (channel) => (0, import_echo.loadObjectReferences)(channel, (channel2) => channel2.threads)
           },
-          [import_types.ThreadType.typename]: {
+          [import_types2.ThreadType.typename]: {
             // TODO(wittjosiah): Move out of metadata.
             loadReferences: (thread) => (0, import_echo.loadObjectReferences)(thread, (thread2) => thread2.messages)
           },
-          [import_types.MessageType.typename]: {
+          [import_types2.MessageType.typename]: {
             // TODO(wittjosiah): Move out of metadata.
             loadReferences: (message) => []
           },
-          [import_chunk_6EVXCSDS.THREAD_ITEM]: {
+          [import_chunk_BWBONZGU.THREAD_ITEM]: {
             parse: (item, type) => {
               switch (type) {
                 case "node":
@@ -502,56 +446,49 @@ var ThreadPlugin = () => {
       ],
       echo: {
         schema: [
-          import_types.ChannelType,
-          import_types.ThreadType,
-          import_types.MessageType
+          import_types2.ChannelType,
+          import_types2.ThreadType,
+          import_types2.MessageType
         ]
       },
       graph: {
         builder: (plugins) => {
           const client = (0, import_app_framework.resolvePlugin)(plugins, import_plugin_client.parseClientPlugin)?.provides.client;
-          const dispatch = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseIntentPlugin)?.provides.intent.dispatch;
+          const dispatch2 = (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 || !dispatch || !metadataResolver) {
+          if (!client || !dispatch2 || !metadataResolver) {
             return [];
           }
           return [
             (0, import_plugin_graph.createExtension)({
-              id: `${import_chunk_6EVXCSDS.THREAD_PLUGIN}/comments-for-subject`,
+              id: `${import_chunk_BWBONZGU.THREAD_PLUGIN}/comments-for-subject`,
               resolver: ({ id }) => {
                 if (!id.endsWith("~comments")) {
                   return;
                 }
-                const subjectId = id.split("~").at(0);
-                const [spaceId, objectId] = subjectId?.split(":") ?? [];
+                const docId = id.split("~").at(0);
+                const [spaceId, objectId] = docId?.split(":") ?? [];
                 const space = client.spaces.get().find((space2) => space2.id === spaceId);
-                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) {
+                const doc = space?.db.getObjectById(objectId);
+                if (!doc || !docId) {
                   return;
                 }
-                const meta = metadataResolver((0, import_echo_schema.getTypename)(object) ?? "");
-                const label = meta.label?.(object) || object.name || meta.placeholder || [
+                const docMeta = metadataResolver((0, import_echo_schema.getTypename)(doc) ?? "");
+                const label = docMeta.label?.(doc) || doc.name || docMeta.placeholder || [
                   "unnamed object threads label",
                   {
-                    ns: import_chunk_6EVXCSDS.THREAD_PLUGIN
+                    ns: import_chunk_BWBONZGU.THREAD_PLUGIN
                   }
                 ];
-                const viewState = getViewState(subjectId);
+                const viewState = getViewState(docId);
                 return {
                   id,
                   type: "orphan-comments-for-subject",
-                  data: null,
+                  data: doc,
                   properties: {
-                    icon: "ph--chat-text--regular",
+                    icon: import_chunk_BWBONZGU.meta_default.iconComponent,
                     label,
-                    showResolvedThreads: viewState.showResolvedThreads,
-                    object
+                    showResolvedThreads: viewState.showResolvedThreads
                   }
                 };
               },
@@ -565,7 +502,7 @@ var ThreadPlugin = () => {
                 const toggle = () => {
                   const newToggleState = !viewState.showResolvedThreads;
                   viewState.showResolvedThreads = newToggleState;
-                  void dispatch({
+                  void dispatch2({
                     action: import_meta.ObservabilityAction.SEND_EVENT,
                     data: {
                       name: "threads.toggle-show-resolved",
@@ -579,26 +516,25 @@ var ThreadPlugin = () => {
                 };
                 return [
                   {
-                    id: `${import_chunk_6EVXCSDS.THREAD_PLUGIN}/toggle-show-resolved/${node.id}`,
+                    id: `${import_chunk_BWBONZGU.THREAD_PLUGIN}/toggle-show-resolved/${node.id}`,
                     data: toggle,
                     properties: {
                       label: [
                         "toggle show resolved",
                         {
-                          ns: import_chunk_6EVXCSDS.THREAD_PLUGIN
+                          ns: import_chunk_BWBONZGU.THREAD_PLUGIN
                         }
                       ],
                       menuItemType: "toggle",
                       isChecked: viewState.showResolvedThreads,
-                      testId: "threadPlugin.toggleShowResolved",
-                      icon: viewState.showResolvedThreads ? "ph--eye-slash--regular" : "ph--eye--regular"
+                      testId: "threadPlugin.toggleShowResolved"
                     }
                   }
                 ];
               }
             }),
             (0, import_plugin_graph.createExtension)({
-              id: import_chunk_FXD3DYMO.ThreadAction.CREATE,
+              id: import_chunk_D5GOVXHS.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);
@@ -611,12 +547,12 @@ var ThreadPlugin = () => {
                 }
                 return [
                   {
-                    id: `${import_chunk_6EVXCSDS.THREAD_PLUGIN}/create/${node.id}`,
+                    id: `${import_chunk_BWBONZGU.THREAD_PLUGIN}/create/${node.id}`,
                     data: async () => {
-                      await dispatch([
+                      await dispatch2([
                         {
-                          plugin: import_chunk_6EVXCSDS.THREAD_PLUGIN,
-                          action: import_chunk_FXD3DYMO.ThreadAction.CREATE
+                          plugin: import_chunk_BWBONZGU.THREAD_PLUGIN,
+                          action: import_chunk_D5GOVXHS.ThreadAction.CREATE
                         },
                         {
                           action: import_plugin_space.SpaceAction.ADD_OBJECT,
@@ -633,10 +569,11 @@ var ThreadPlugin = () => {
                       label: [
                         "create channel label",
                         {
-                          ns: import_chunk_6EVXCSDS.THREAD_PLUGIN
+                          ns: import_chunk_BWBONZGU.THREAD_PLUGIN
                         }
                       ],
-                      icon: "ph--chat--regular",
+                      icon: (props) => /* @__PURE__ */ import_react2.default.createElement(import_react.Chat, props),
+                      iconSymbol: "ph--chat--regular",
                       testId: "threadPlugin.createObject"
                     }
                   }
@@ -650,19 +587,21 @@ var ThreadPlugin = () => {
         component: ({ data, role }) => {
           switch (role) {
             case "main": {
-              return data.active instanceof import_types.ChannelType && data.active.threads[0] ? /* @__PURE__ */ import_react.default.createElement(ThreadMain, {
+              return data.active instanceof import_types2.ChannelType && data.active.threads[0] ? /* @__PURE__ */ import_react2.default.createElement(ThreadMain, {
                 thread: data.active.threads[0]
               }) : null;
             }
             case "settings": {
-              return data.plugin === import_chunk_6EVXCSDS.meta_default.id ? /* @__PURE__ */ import_react.default.createElement(ThreadSettings, {
+              return data.plugin === import_chunk_BWBONZGU.meta_default.id ? /* @__PURE__ */ import_react2.default.createElement(ThreadSettings, {
                 settings: settings.values
               }) : null;
             }
             case "article":
             case "complementary": {
               const location = navigationPlugin?.provides.location;
-              if (data.object instanceof import_types.ChannelType && data.object.threads[0]) {
+              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]) {
                 const channel = data.object;
                 if ((0, import_app_framework.isLayoutParts)(location?.active) && location.active.main) {
                   const layoutEntries = location.active.main;
@@ -670,32 +609,101 @@ var ThreadPlugin = () => {
                   if (currentPosition > 0) {
                     const objectToTheLeft = layoutEntries[currentPosition - 1];
                     const context = (0, import_echo.getSpace)(data.object)?.db.getObjectById(objectToTheLeft.id);
-                    return /* @__PURE__ */ import_react.default.createElement(ThreadArticle, {
+                    return /* @__PURE__ */ import_react2.default.createElement(ThreadArticle, {
                       thread: data.object.threads[0],
                       context
                     });
                   }
                 }
-                return /* @__PURE__ */ import_react.default.createElement(ThreadArticle, {
+                return /* @__PURE__ */ import_react2.default.createElement(ThreadArticle, {
                   thread: data.object.threads[0]
                 });
               }
-              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, {
+              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, {
                   attendableId: data.subject.id
-                }), /* @__PURE__ */ import_react.default.createElement(import_chunk_PZVUW4W2.ChatContainer, {
+                }), /* @__PURE__ */ import_react2.default.createElement(import_chunk_5PZNPPQF.ChatContainer, {
                   thread: data.subject
                 }));
               }
               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)],
-                  current: state.current,
-                  showResolvedThreads
-                });
+                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)))));
               }
             }
           }
@@ -705,24 +713,11 @@ var ThreadPlugin = () => {
       intent: {
         resolver: async (intent) => {
           switch (intent.action) {
-            case import_chunk_FXD3DYMO.ThreadAction.CREATE: {
+            case import_chunk_D5GOVXHS.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) {
-                    import_log.log.error("Subject does not support threads array", subject?.typename, {
-                      F: __dxlog_file,
-                      L: 331,
-                      S: void 0,
-                      C: (f, a) => f(...a)
-                    });
-                    return;
-                  }
-                }
                 const subjectId = (0, import_echo.fullyQualifiedId)(subject);
-                const thread = (0, import_echo_schema2.create)(import_types.ThreadType, {
+                const thread = (0, import_echo_schema2.create)(import_types2.ThreadType, {
                   name,
                   anchor: cursor,
                   messages: [],
@@ -741,9 +736,18 @@ var ThreadPlugin = () => {
                   intents: [
                     [
                       {
-                        action: import_chunk_FXD3DYMO.ThreadAction.SELECT,
+                        action: import_app_framework.NavigationAction.OPEN,
+                        data: {
+                          activeParts: {
+                            complementary: `${subjectId}${import_app_framework.SLUG_PATH_SEPARATOR}comments${import_app_framework.SLUG_COLLECTION_INDICATOR}`
+                          }
+                        }
+                      },
+                      {
+                        action: import_chunk_D5GOVXHS.ThreadAction.SELECT,
                         data: {
-                          current: (0, import_echo.fullyQualifiedId)(thread)
+                          current: thread.id,
+                          focus: true
                         }
                       },
                       {
@@ -759,9 +763,9 @@ var ThreadPlugin = () => {
                 };
               } else {
                 return {
-                  data: (0, import_echo_schema2.create)(import_types.ChannelType, {
+                  data: (0, import_echo_schema2.create)(import_types2.ChannelType, {
                     threads: [
-                      (0, import_echo_schema2.create)(import_types.ThreadType, {
+                      (0, import_echo_schema2.create)(import_types2.ThreadType, {
                         messages: []
                       })
                     ]
@@ -769,15 +773,16 @@ var ThreadPlugin = () => {
                 };
               }
             }
-            case import_chunk_FXD3DYMO.ThreadAction.SELECT: {
+            case import_chunk_D5GOVXHS.ThreadAction.SELECT: {
+              state.focus = intent.data?.current === state.current ? state.focus : intent.data?.focus;
               state.current = intent.data?.current;
               return {
                 data: true
               };
             }
-            case import_chunk_FXD3DYMO.ThreadAction.TOGGLE_RESOLVED: {
+            case import_chunk_D5GOVXHS.ThreadAction.TOGGLE_RESOLVED: {
               const { thread } = intent.data ?? {};
-              if (!(thread instanceof import_types.ThreadType)) {
+              if (!(thread instanceof import_types2.ThreadType)) {
                 return;
               }
               if (thread.status === "active" || thread.status === void 0) {
@@ -804,9 +809,9 @@ var ThreadPlugin = () => {
                 ]
               };
             }
-            case import_chunk_FXD3DYMO.ThreadAction.DELETE: {
+            case import_chunk_D5GOVXHS.ThreadAction.DELETE: {
               const { subject, thread } = intent.data ?? {};
-              if (!(thread instanceof import_types.ThreadType) || !(subject && typeof subject === "object" && "threads" in subject)) {
+              if (!(subject instanceof import_types.DocumentType) || !(thread instanceof import_types2.ThreadType)) {
                 return;
               }
               const subjectId = (0, import_echo.fullyQualifiedId)(subject);
@@ -815,9 +820,7 @@ var ThreadPlugin = () => {
                 const index = stagingArea.findIndex((t) => t.id === thread.id);
                 if (index !== -1) {
                   stagingArea.splice(index, 1);
-                  return {
-                    data: true
-                  };
+                  return;
                 }
               }
               const space = (0, import_echo.getSpace)(thread);
@@ -833,7 +836,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_BWBONZGU.THREAD_PLUGIN]["thread deleted label"],
                     data: {
                       cursor
                     }
@@ -876,9 +879,9 @@ var ThreadPlugin = () => {
               }
               break;
             }
-            case import_chunk_FXD3DYMO.ThreadAction.ON_MESSAGE_ADD: {
+            case import_chunk_D5GOVXHS.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))) {
+              if (!(thread instanceof import_types2.ThreadType) || !(subject && typeof subject === "object" && "threads" in subject)) {
                 return;
               }
               const subjectId = (0, import_echo.fullyQualifiedId)(subject);
@@ -919,10 +922,10 @@ var ThreadPlugin = () => {
                 ]
               };
             }
-            case import_chunk_FXD3DYMO.ThreadAction.DELETE_MESSAGE: {
+            case import_chunk_D5GOVXHS.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)) {
+              if (!(subject instanceof import_types.DocumentType) || !(thread instanceof import_types2.ThreadType) || !space) {
                 return;
               }
               if (!intent.undo) {
@@ -936,7 +939,7 @@ var ThreadPlugin = () => {
                     intents: [
                       [
                         {
-                          action: import_chunk_FXD3DYMO.ThreadAction.DELETE,
+                          action: import_chunk_D5GOVXHS.ThreadAction.DELETE,
                           data: {
                             subject,
                             thread
@@ -950,7 +953,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_BWBONZGU.THREAD_PLUGIN]["message deleted label"],
                     data: {
                       message,
                       messageIndex
@@ -964,7 +967,7 @@ var ThreadPlugin = () => {
                           name: "threads.message.delete",
                           properties: {
                             threadId: thread.id,
-                            spaceId: space?.id
+                            spaceId: space.id
                           }
                         }
                       }
@@ -974,7 +977,7 @@ var ThreadPlugin = () => {
               } else if (intent.undo) {
                 const message = intent.data?.message;
                 const messageIndex = intent.data?.messageIndex;
-                if (!(message instanceof import_types.MessageType) || !(typeof messageIndex === "number")) {
+                if (!(message instanceof import_types2.MessageType) || !(typeof messageIndex === "number")) {
                   return;
                 }
                 thread.messages.splice(messageIndex, 0, message);
@@ -988,7 +991,7 @@ var ThreadPlugin = () => {
                           name: "threads.message.undo-delete",
                           properties: {
                             threadId: thread.id,
-                            spaceId: space?.id
+                            spaceId: space.id
                           }
                         }
                       }
@@ -1029,19 +1032,19 @@ var ThreadPlugin = () => {
                 });
               }
             }),
-            (0, import_react_ui_editor.createExternalCommentSync)((0, import_echo.fullyQualifiedId)(doc), (sink) => (0, import_signals_core.effect)(() => sink()), () => threads.value.filter((thread) => thread?.anchor).map((thread) => ({
-              id: (0, import_echo.fullyQualifiedId)(thread),
+            (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: (0, import_echo.fullyQualifiedId)(doc),
+              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,
+                  action: import_chunk_D5GOVXHS.ThreadAction.CREATE,
                   data: {
                     cursor,
                     name,
@@ -1052,7 +1055,7 @@ var ThreadPlugin = () => {
               onDelete: ({ id }) => {
                 const stagingArea = state.staging[(0, import_echo.fullyQualifiedId)(doc)];
                 if (stagingArea) {
-                  const index = stagingArea.findIndex((thread2) => (0, import_echo.fullyQualifiedId)(thread2) === id);
+                  const index = stagingArea.findIndex((thread2) => thread2.id === id);
                   if (index !== -1) {
                     stagingArea.splice(index, 1);
                   }
@@ -1063,8 +1066,8 @@ var ThreadPlugin = () => {
                 }
               },
               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 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"
@@ -1073,11 +1076,11 @@ var ThreadPlugin = () => {
                 }
               },
               onSelect: ({ selection: { current, closest } }) => {
-                const dispatch = intentPlugin?.provides.intent.dispatch;
-                if (dispatch) {
-                  void dispatch([
+                const dispatch2 = intentPlugin?.provides.intent.dispatch;
+                if (dispatch2) {
+                  void dispatch2([
                     {
-                      action: import_chunk_FXD3DYMO.ThreadAction.SELECT,
+                      action: import_chunk_D5GOVXHS.ThreadAction.SELECT,
                       data: {
                         current: current ?? closest
                       }