@dxos/plugin-thread 0.7.2 → 0.7.3-staging.971cd8d

package/dist/lib/node/index.cjs

@@ -28,16 +28,16 @@ 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_ANGUPCW3.ThreadAction,
+  ThreadAction: () => import_chunk_XFO6D2LG.ThreadAction,
   ThreadPlugin: () => ThreadPlugin,
   default: () => src_default,
-  useAnalyticsCallback: () => import_chunk_AWJEBUB4.useAnalyticsCallback,
-  useOnEditAnalytics: () => import_chunk_AWJEBUB4.useOnEditAnalytics,
-  useStatus: () => import_chunk_AWJEBUB4.useStatus
+  useAnalyticsCallback: () => import_chunk_YCDM2SZM.useAnalyticsCallback,
+  useOnEditAnalytics: () => import_chunk_YCDM2SZM.useOnEditAnalytics,
+  useStatus: () => import_chunk_YCDM2SZM.useStatus
 });
 module.exports = __toCommonJS(node_exports);
-var import_chunk_ANGUPCW3 = require("./chunk-ANGUPCW3.cjs");
-var import_chunk_AWJEBUB4 = require("./chunk-AWJEBUB4.cjs");
+var import_chunk_XFO6D2LG = require("./chunk-XFO6D2LG.cjs");
+var import_chunk_YCDM2SZM = require("./chunk-YCDM2SZM.cjs");
 var import_chunk_IC2NICNC = require("./chunk-IC2NICNC.cjs");
 var import_react = __toESM(require("react"));
 var import_app_framework = require("@dxos/app-framework");
@@ -49,14 +49,13 @@ 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_echo2 = require("@dxos/react-client/echo");
 var import_react_ui_thread = require("@dxos/react-ui-thread");
 var import_react2 = require("react");
 var import_react3 = require("@phosphor-icons/react");
 var import_react4 = __toESM(require("react"));
-var import_echo_schema = require("@dxos/echo-schema");
+var import_live_object = require("@dxos/live-object");
 var import_types2 = require("@dxos/plugin-space/types");
-var import_echo3 = require("@dxos/react-client/echo");
+var import_echo2 = require("@dxos/react-client/echo");
 var import_halo = require("@dxos/react-client/halo");
 var import_react_ui = require("@dxos/react-ui");
 var import_react_ui_editor = require("@dxos/react-ui-editor");
@@ -65,12 +64,12 @@ var import_react_ui_thread2 = require("@dxos/react-ui-thread");
 var import_util = require("@dxos/util");
 var import_react5 = require("@phosphor-icons/react");
 var import_react6 = __toESM(require("react"));
-var import_echo4 = require("@dxos/react-client/echo");
+var import_echo3 = require("@dxos/react-client/echo");
 var import_react_ui2 = require("@dxos/react-ui");
 var import_react_ui_theme2 = require("@dxos/react-ui-theme");
 var import_react7 = __toESM(require("react"));
 var import_app_framework2 = require("@dxos/app-framework");
-var import_echo5 = require("@dxos/react-client/echo");
+var import_echo4 = require("@dxos/react-client/echo");
 var import_react_ui_attention = require("@dxos/react-ui-attention");
 var import_util2 = require("@dxos/util");
 var import_react8 = __toESM(require("react"));
@@ -79,9 +78,10 @@ var import_react_ui_form = require("@dxos/react-ui-form");
 var import_view = require("@codemirror/view");
 var import_signals_core = require("@preact/signals-core");
 var import_types3 = require("@dxos/plugin-space/types");
-var import_echo6 = require("@dxos/react-client/echo");
+var import_echo5 = require("@dxos/react-client/echo");
 var import_react_ui_editor2 = require("@dxos/react-ui-editor");
 var import_util3 = require("@dxos/util");
+var import_types4 = require("@dxos/plugin-space/types");
 var sizeClass = (0, import_react_ui_theme.getSize)(4);
 var commentControlClassNames = "!p-1 !min-bs-0 transition-opacity";
 var ToggleResolvedButton = ({ isResolved, onResolve }) => {
@@ -131,13 +131,13 @@ var DeleteThreadButton = ({ onDelete }) => {
 };
 var CommentContainer = ({ thread, detached, context, current, onAttend, onThreadDelete, onMessageDelete, onResolve, onComment }) => {
   const identity = (0, import_halo.useIdentity)();
-  const space = (0, import_echo3.getSpace)(thread);
-  const members = (0, import_echo3.useMembers)(space?.key);
-  const activity = (0, import_chunk_AWJEBUB4.useStatus)(space, (0, import_echo3.fullyQualifiedId)(thread));
+  const space = (0, import_echo2.getSpace)(thread);
+  const members = (0, import_echo2.useMembers)(space?.key);
+  const activity = (0, import_chunk_YCDM2SZM.useStatus)(space, (0, import_echo2.fullyQualifiedId)(thread));
   const { t } = (0, import_react_ui.useTranslation)(import_chunk_IC2NICNC.THREAD_PLUGIN);
   const threadScrollRef = (0, import_react4.useRef)(null);
   const { themeMode } = (0, import_react_ui.useThemeContext)();
-  const textboxMetadata = (0, import_chunk_AWJEBUB4.getMessageMetadata)((0, import_echo3.fullyQualifiedId)(thread), identity);
+  const textboxMetadata = (0, import_chunk_YCDM2SZM.getMessageMetadata)((0, import_echo2.fullyQualifiedId)(thread), identity);
   const [_count, _setCount] = (0, import_react4.useState)(0);
   const rerenderEditor = () => _setCount((count) => count + 1);
   const messageRef = (0, import_react4.useRef)("");
@@ -151,7 +151,7 @@ var CommentContainer = ({ thread, detached, context, current, onAttend, onThread
     (0, import_react_ui_editor.listener)({
       onChange: (text) => messageRef.current = text
     }),
-    import_chunk_AWJEBUB4.command
+    import_chunk_YCDM2SZM.command
   ], [
     _count
   ]);
@@ -163,7 +163,7 @@ var CommentContainer = ({ thread, detached, context, current, onAttend, onThread
     if (!messageRef.current) {
       return false;
     }
-    thread.messages.push((0, import_echo_schema.create)(import_types2.MessageType, {
+    thread.messages.push((0, import_live_object.create)(import_types2.MessageType, {
       sender: {
         identityKey: identity.identityKey.toHex()
       },
@@ -184,7 +184,7 @@ var CommentContainer = ({ thread, detached, context, current, onAttend, onThread
     onClickCapture: onAttend,
     onFocusCapture: onAttend,
     current,
-    id: (0, import_echo3.fullyQualifiedId)(thread)
+    id: (0, import_echo2.fullyQualifiedId)(thread)
   }, /* @__PURE__ */ import_react4.default.createElement("div", {
     role: "none",
     className: (0, import_react_ui_theme.mx)("col-span-2 grid grid-cols-[var(--rail-size)_1fr_min-content]", import_react_ui_theme.hoverableControls, import_react_ui_theme.hoverableFocusedWithinControls)
@@ -204,7 +204,7 @@ var CommentContainer = ({ thread, detached, context, current, onAttend, onThread
     onResolve
   }), onThreadDelete && /* @__PURE__ */ import_react4.default.createElement(DeleteThreadButton, {
     onDelete: onThreadDelete
-  }))), thread.messages.filter(import_util.nonNullable).map((message) => /* @__PURE__ */ import_react4.default.createElement(import_chunk_AWJEBUB4.MessageContainer, {
+  }))), thread.messages.filter(import_util.nonNullable).map((message) => /* @__PURE__ */ import_react4.default.createElement(import_chunk_YCDM2SZM.MessageContainer, {
     key: message.id,
     message,
     members,
@@ -235,7 +235,7 @@ var CommentsContainer = ({ threads: threads2, detached = [], currentId, showReso
     currentId
   ]);
   return /* @__PURE__ */ import_react6.default.createElement(import_react6.default.Fragment, null, filteredThreads.length > 0 ? filteredThreads.map((thread) => {
-    const threadId = (0, import_echo4.fullyQualifiedId)(thread);
+    const threadId = (0, import_echo3.fullyQualifiedId)(thread);
     return /* @__PURE__ */ import_react6.default.createElement(CommentContainer, {
       key: threadId,
       thread,
@@ -292,7 +292,7 @@ var ThreadComplementary = ({ role, subject, drafts, current, showResolvedThreads
     JSON.stringify(drafts)
   ]);
   const detachedIds = (0, import_react7.useMemo)(() => {
-    return threads2.filter(({ anchor }) => !anchor).map((thread) => (0, import_echo5.fullyQualifiedId)(thread));
+    return threads2.filter(({ anchor }) => !anchor).map((thread) => (0, import_echo4.fullyQualifiedId)(thread));
   }, [
     threads2
   ]);
@@ -306,21 +306,21 @@ var ThreadComplementary = ({ role, subject, drafts, current, showResolvedThreads
     threads2
   ]);
   const attended = (0, import_react_ui_attention.useAttended)();
-  const qualifiedSubjectId = (0, import_echo5.fullyQualifiedId)(subject);
+  const qualifiedSubjectId = (0, import_echo4.fullyQualifiedId)(subject);
   return /* @__PURE__ */ import_react7.default.createElement(CommentsContainer, {
     threads: threads2,
     detached: detachedIds,
     currentId: attended.includes(qualifiedSubjectId) ? current : void 0,
     showResolvedThreads,
     onThreadAttend: (thread) => {
-      const threadId = (0, import_echo5.fullyQualifiedId)(thread);
+      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_echo5.fullyQualifiedId)(subject),
+              id: (0, import_echo4.fullyQualifiedId)(subject),
               thread: threadId,
               cursor: thread.anchor
             }
@@ -331,7 +331,7 @@ var ThreadComplementary = ({ role, subject, drafts, current, showResolvedThreads
     onThreadDelete: (thread) => {
       return dispatch({
         plugin: import_chunk_IC2NICNC.THREAD_PLUGIN,
-        action: import_chunk_ANGUPCW3.ThreadAction.DELETE,
+        action: import_chunk_XFO6D2LG.ThreadAction.DELETE,
         data: {
           subject,
           thread
@@ -340,7 +340,7 @@ var ThreadComplementary = ({ role, subject, drafts, current, showResolvedThreads
     },
     onMessageDelete: (thread, messageId) => dispatch({
       plugin: import_chunk_IC2NICNC.THREAD_PLUGIN,
-      action: import_chunk_ANGUPCW3.ThreadAction.DELETE_MESSAGE,
+      action: import_chunk_XFO6D2LG.ThreadAction.DELETE_MESSAGE,
       data: {
         subject,
         thread,
@@ -349,14 +349,14 @@ var ThreadComplementary = ({ role, subject, drafts, current, showResolvedThreads
     }),
     onThreadToggleResolved: (thread) => dispatch({
       plugin: import_chunk_IC2NICNC.THREAD_PLUGIN,
-      action: import_chunk_ANGUPCW3.ThreadAction.TOGGLE_RESOLVED,
+      action: import_chunk_XFO6D2LG.ThreadAction.TOGGLE_RESOLVED,
       data: {
         thread
       }
     }),
     onComment: (thread) => {
       void dispatch({
-        action: import_chunk_ANGUPCW3.ThreadAction.ON_MESSAGE_ADD,
+        action: import_chunk_XFO6D2LG.ThreadAction.ON_MESSAGE_ADD,
         data: {
           thread,
           subject
@@ -374,18 +374,18 @@ var ThreadSettings = ({ settings }) => {
     onCheckedChange: (checked) => settings.standalone = !!checked
   })));
 };
-var ThreadMain = (0, import_react2.lazy)(() => import("./ThreadMain-UYUGGUOM.cjs"));
-var ThreadArticle = (0, import_react2.lazy)(() => import("./ThreadArticle-QQMCCCH5.cjs"));
+var ThreadMain = (0, import_react2.lazy)(() => import("./ThreadMain-MRNJC3TI.cjs"));
+var ThreadArticle = (0, import_react2.lazy)(() => import("./ThreadArticle-I7ADXDW3.cjs"));
 var getName = (doc, anchor) => {
   if (doc.content) {
     const [start, end] = anchor.split(":");
-    return (0, import_echo6.getTextInRange)((0, import_echo6.createDocAccessor)(doc.content, [
+    return (0, import_echo5.getTextInRange)((0, import_echo5.createDocAccessor)(doc.content, [
       "content"
     ]), start, end);
   }
 };
 var threads = (state, doc, dispatch) => {
-  const space = doc && (0, import_echo6.getSpace)(doc);
+  const space = doc && (0, import_echo5.getSpace)(doc);
   if (!doc || !space || !dispatch) {
     return [
       (0, import_react_ui_editor2.comments)()
@@ -393,7 +393,7 @@ var threads = (state, doc, dispatch) => {
   }
   const threads2 = (0, import_signals_core.computed)(() => [
     ...doc.threads.filter(import_util3.nonNullable),
-    ...state.drafts[(0, import_echo6.fullyQualifiedId)(doc)] ?? []
+    ...state.drafts[(0, import_echo5.fullyQualifiedId)(doc)] ?? []
   ].filter((thread) => !(thread?.status === "resolved")));
   return [
     import_view.EditorView.updateListener.of((update) => {
@@ -408,16 +408,16 @@ var threads = (state, doc, dispatch) => {
         });
       }
     }),
-    (0, import_react_ui_editor2.createExternalCommentSync)((0, import_echo6.fullyQualifiedId)(doc), (sink) => (0, import_signals_core.effect)(() => sink()), () => threads2.value.filter((thread) => thread?.anchor).map((thread) => ({
-      id: (0, import_echo6.fullyQualifiedId)(thread),
+    (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_echo6.fullyQualifiedId)(doc),
+      id: (0, import_echo5.fullyQualifiedId)(doc),
       onCreate: ({ cursor }) => {
         const name = getName(doc, cursor);
         void dispatch({
-          action: import_chunk_ANGUPCW3.ThreadAction.CREATE,
+          action: import_chunk_XFO6D2LG.ThreadAction.CREATE,
           data: {
             cursor,
             name,
@@ -426,9 +426,9 @@ var threads = (state, doc, dispatch) => {
         });
       },
       onDelete: ({ id }) => {
-        const draft = state.drafts[(0, import_echo6.fullyQualifiedId)(doc)];
+        const draft = state.drafts[(0, import_echo5.fullyQualifiedId)(doc)];
         if (draft) {
-          const index = draft.findIndex((thread2) => (0, import_echo6.fullyQualifiedId)(thread2) === id);
+          const index = draft.findIndex((thread2) => (0, import_echo5.fullyQualifiedId)(thread2) === id);
           if (index !== -1) {
             draft.splice(index, 1);
           }
@@ -439,7 +439,7 @@ var threads = (state, doc, dispatch) => {
         }
       },
       onUpdate: ({ id, cursor }) => {
-        const thread = state.drafts[(0, import_echo6.fullyQualifiedId)(doc)]?.find((thread2) => (0, import_echo6.fullyQualifiedId)(thread2) === id) ?? doc.threads.find((thread2) => thread2?.id === id);
+        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;
@@ -447,7 +447,7 @@ var threads = (state, doc, dispatch) => {
       },
       onSelect: ({ selection: { current, closest } }) => {
         void dispatch({
-          action: import_chunk_ANGUPCW3.ThreadAction.SELECT,
+          action: import_chunk_XFO6D2LG.ThreadAction.SELECT,
           data: {
             current: current ?? closest,
             skipOpen: true
@@ -460,6 +460,9 @@ var threads = (state, doc, dispatch) => {
 var translations_default = [
   {
     "en-US": {
+      [import_types4.ChannelType.typename]: {
+        "typename label": "Channel"
+      },
       [import_chunk_IC2NICNC.THREAD_PLUGIN]: {
         "plugin name": "Threads",
         "channel name placeholder": "New channel",
@@ -515,13 +518,29 @@ var ThreadPlugin = () => {
   const unsubscribeCallbacks = [];
   return {
     meta: import_chunk_IC2NICNC.meta_default,
-    ready: async (plugins) => {
+    initialize: async () => {
       settings.prop({
         key: "standalone",
         type: import_local_storage.LocalStorageStore.bool({
           allowUndefined: true
         })
       });
+      return {
+        echo: {
+          system: [
+            import_types.ThreadType,
+            import_types.MessageType
+          ],
+          // TODO(wittjosiah): Requires reload.
+          ...settings.values.standalone ? {
+            schema: [
+              import_types.ChannelType
+            ]
+          } : {}
+        }
+      };
+    },
+    ready: async (plugins) => {
       navigationPlugin = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseNavigationPlugin);
       intentPlugin = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseIntentPlugin);
     },
@@ -533,6 +552,7 @@ var ThreadPlugin = () => {
       metadata: {
         records: {
           [import_types.ChannelType.typename]: {
+            createObject: import_chunk_XFO6D2LG.ThreadAction.CREATE,
             placeholder: [
               "channel name placeholder",
               {
@@ -541,11 +561,11 @@ var ThreadPlugin = () => {
             ],
             icon: "ph--chat--regular",
             // TODO(wittjosiah): Move out of metadata.
-            loadReferences: (channel) => (0, import_echo2.loadObjectReferences)(channel, (channel2) => channel2.threads)
+            loadReferences: (channel) => (0, import_echo.loadObjectReferences)(channel, (channel2) => channel2.threads)
           },
           [import_types.ThreadType.typename]: {
             // TODO(wittjosiah): Move out of metadata.
-            loadReferences: (thread) => (0, import_echo2.loadObjectReferences)(thread, (thread2) => thread2.messages)
+            loadReferences: (thread) => (0, import_echo.loadObjectReferences)(thread, (thread2) => thread2.messages)
           },
           [import_types.MessageType.typename]: {
             // TODO(wittjosiah): Move out of metadata.
@@ -576,13 +596,6 @@ var ThreadPlugin = () => {
         ...translations_default,
         ...import_react_ui_thread.translations
       ],
-      echo: {
-        schema: [
-          import_types.ChannelType,
-          import_types.ThreadType,
-          import_types.MessageType
-        ]
-      },
       complementary: {
         panels: [
           {
@@ -615,8 +628,9 @@ var ThreadPlugin = () => {
                   return;
                 }
                 const [subjectId] = id.split("~");
-                const { spaceId, objectId } = (0, import_echo2.parseId)(subjectId);
-                const space = client.spaces.get().find((space2) => space2.id === spaceId);
+                const { spaceId, objectId } = (0, import_echo.parseId)(subjectId);
+                const spaces = (0, import_plugin_graph.toSignal)((onChange) => client.spaces.subscribe(() => onChange()).unsubscribe, () => client.spaces.get());
+                const space = spaces?.find((space2) => space2.id === spaceId && space2.state.get() === import_echo.SpaceState.SPACE_READY);
                 if (!objectId) {
                   return {
                     id,
@@ -636,15 +650,9 @@ var ThreadPlugin = () => {
                     }
                   };
                 }
-                const object = (0, import_plugin_graph.toSignal)((onChange) => {
-                  const timeout = setTimeout(async () => {
-                    await space?.db.query({
-                      id: objectId
-                    }).first();
-                    onChange();
-                  });
-                  return () => clearTimeout(timeout);
-                }, () => space?.db.getObjectById(objectId), subjectId);
+                const [object] = (0, import_plugin_space.memoizeQuery)(space, {
+                  id: objectId
+                });
                 if (!object || !subjectId) {
                   return;
                 }
@@ -711,7 +719,7 @@ var ThreadPlugin = () => {
               }
             }),
             (0, import_plugin_graph.createExtension)({
-              id: import_chunk_ANGUPCW3.ThreadAction.CREATE,
+              id: import_chunk_XFO6D2LG.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);
@@ -729,7 +737,7 @@ var ThreadPlugin = () => {
                       await dispatch([
                         {
                           plugin: import_chunk_IC2NICNC.THREAD_PLUGIN,
-                          action: import_chunk_ANGUPCW3.ThreadAction.CREATE
+                          action: import_chunk_XFO6D2LG.ThreadAction.CREATE
                         },
                         {
                           action: import_plugin_space.SpaceAction.ADD_OBJECT,
@@ -781,7 +789,7 @@ var ThreadPlugin = () => {
                   const currentPosition = layoutEntries.findIndex((entry) => channel.id === entry.id);
                   if (currentPosition > 0) {
                     const objectToTheLeft = layoutEntries[currentPosition - 1];
-                    const context = (0, import_echo2.getSpace)(data.object)?.db.getObjectById(objectToTheLeft.id);
+                    const context = (0, import_echo.getSpace)(data.object)?.db.getObjectById(objectToTheLeft.id);
                     return /* @__PURE__ */ import_react.default.createElement(ThreadArticle, {
                       thread: data.object.threads[0],
                       context
@@ -793,9 +801,9 @@ 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_AWJEBUB4.ChatHeading, {
+                return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_chunk_YCDM2SZM.ChatHeading, {
                   attendableId: data.subject.id
-                }), /* @__PURE__ */ import_react.default.createElement(import_chunk_AWJEBUB4.ChatContainer, {
+                }), /* @__PURE__ */ import_react.default.createElement(import_chunk_YCDM2SZM.ChatContainer, {
                   thread: data.subject
                 }));
               }
@@ -803,11 +811,11 @@ var ThreadPlugin = () => {
             }
             case "complementary--comments": {
               if (data.subject && typeof data.subject === "object" && "threads" in data.subject && Array.isArray(data.subject.threads) && !(data.subject instanceof import_types.ChannelType)) {
-                const { showResolvedThreads } = getViewState((0, import_echo2.fullyQualifiedId)(data.subject));
+                const { showResolvedThreads } = getViewState((0, import_echo.fullyQualifiedId)(data.subject));
                 return /* @__PURE__ */ import_react.default.createElement(ThreadComplementary, {
                   role,
                   subject: data.subject,
-                  drafts: state.drafts[(0, import_echo2.fullyQualifiedId)(data.subject)],
+                  drafts: state.drafts[(0, import_echo.fullyQualifiedId)(data.subject)],
                   current: state.current,
                   showResolvedThreads
                 });
@@ -821,7 +829,7 @@ var ThreadPlugin = () => {
       intent: {
         resolver: async (intent) => {
           switch (intent.action) {
-            case import_chunk_ANGUPCW3.ThreadAction.CREATE: {
+            case import_chunk_XFO6D2LG.ThreadAction.CREATE: {
               if (intent.data && intent.data.cursor !== void 0) {
                 const { cursor, name, subject } = intent.data;
                 if (subject?.threads === void 0) {
@@ -830,14 +838,14 @@ var ThreadPlugin = () => {
                   } catch (err) {
                     import_log.log.error("Subject does not support threads array", subject?.typename, {
                       F: __dxlog_file,
-                      L: 357,
+                      L: 371,
                       S: void 0,
                       C: (f, a) => f(...a)
                     });
                     return;
                   }
                 }
-                const subjectId = (0, import_echo2.fullyQualifiedId)(subject);
+                const subjectId = (0, import_echo.fullyQualifiedId)(subject);
                 const thread = (0, import_echo.create)(import_types.ThreadType, {
                   name,
                   anchor: cursor,
@@ -857,9 +865,9 @@ var ThreadPlugin = () => {
                   intents: [
                     [
                       {
-                        action: import_chunk_ANGUPCW3.ThreadAction.SELECT,
+                        action: import_chunk_XFO6D2LG.ThreadAction.SELECT,
                         data: {
-                          current: (0, import_echo2.fullyQualifiedId)(thread)
+                          current: (0, import_echo.fullyQualifiedId)(thread)
                         }
                       }
                     ],
@@ -896,7 +904,7 @@ var ThreadPlugin = () => {
                 };
               }
             }
-            case import_chunk_ANGUPCW3.ThreadAction.SELECT: {
+            case import_chunk_XFO6D2LG.ThreadAction.SELECT: {
               state.current = intent.data?.current;
               return {
                 data: true,
@@ -914,7 +922,7 @@ var ThreadPlugin = () => {
                 ] : []
               };
             }
-            case import_chunk_ANGUPCW3.ThreadAction.TOGGLE_RESOLVED: {
+            case import_chunk_XFO6D2LG.ThreadAction.TOGGLE_RESOLVED: {
               const { thread } = intent.data ?? {};
               if (!(thread instanceof import_types.ThreadType)) {
                 return;
@@ -924,7 +932,7 @@ var ThreadPlugin = () => {
               } else if (thread.status === "resolved") {
                 thread.status = "active";
               }
-              const space = (0, import_echo2.getSpace)(thread);
+              const space = (0, import_echo.getSpace)(thread);
               const spaceId = space?.id;
               return {
                 data: true,
@@ -944,12 +952,12 @@ var ThreadPlugin = () => {
                 ]
               };
             }
-            case import_chunk_ANGUPCW3.ThreadAction.DELETE: {
+            case import_chunk_XFO6D2LG.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_echo2.fullyQualifiedId)(subject);
+              const subjectId = (0, import_echo.fullyQualifiedId)(subject);
               const draft = state.drafts[subjectId];
               if (draft) {
                 const index = draft.findIndex((t) => t.id === thread.id);
@@ -960,7 +968,7 @@ var ThreadPlugin = () => {
                   };
                 }
               }
-              const space = (0, import_echo2.getSpace)(thread);
+              const space = (0, import_echo.getSpace)(thread);
               if (!space || !subject.threads) {
                 return;
               }
@@ -1016,13 +1024,13 @@ var ThreadPlugin = () => {
               }
               break;
             }
-            case import_chunk_ANGUPCW3.ThreadAction.ON_MESSAGE_ADD: {
+            case import_chunk_XFO6D2LG.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;
               }
-              const subjectId = (0, import_echo2.fullyQualifiedId)(subject);
-              const space = (0, import_echo2.getSpace)(subject);
+              const subjectId = (0, import_echo.fullyQualifiedId)(subject);
+              const space = (0, import_echo.getSpace)(subject);
               const intents = [];
               const analyticsProperties = {
                 threadId: thread.id,
@@ -1059,9 +1067,9 @@ var ThreadPlugin = () => {
                 ]
               };
             }
-            case import_chunk_ANGUPCW3.ThreadAction.DELETE_MESSAGE: {
+            case import_chunk_XFO6D2LG.ThreadAction.DELETE_MESSAGE: {
               const { subject, thread, messageId } = intent.data ?? {};
-              const space = (0, import_echo2.getSpace)(subject);
+              const space = (0, import_echo.getSpace)(subject);
               if (!(thread instanceof import_types.ThreadType) || !(subject && typeof subject === "object" && "threads" in subject)) {
                 return;
               }
@@ -1076,7 +1084,7 @@ var ThreadPlugin = () => {
                     intents: [
                       [
                         {
-                          action: import_chunk_ANGUPCW3.ThreadAction.DELETE,
+                          action: import_chunk_XFO6D2LG.ThreadAction.DELETE,
                           data: {
                             subject,
                             thread