@dxos/plugin-thread 0.7.4 → 0.7.5-main.9cb18ac

package/dist/lib/node/index.cjs

@@ -28,33 +28,34 @@ 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_XFO6D2LG.ThreadAction,
+  ThreadAction: () => import_chunk_VW2P26MZ.ThreadAction,
   ThreadPlugin: () => ThreadPlugin,
   default: () => src_default,
-  useAnalyticsCallback: () => import_chunk_YCDM2SZM.useAnalyticsCallback,
-  useOnEditAnalytics: () => import_chunk_YCDM2SZM.useOnEditAnalytics,
-  useStatus: () => import_chunk_YCDM2SZM.useStatus
+  useAnalyticsCallback: () => import_chunk_2CB5AVBL.useAnalyticsCallback,
+  useOnEditAnalytics: () => import_chunk_2CB5AVBL.useOnEditAnalytics,
+  useStatus: () => import_chunk_2CB5AVBL.useStatus
 });
 module.exports = __toCommonJS(node_exports);
-var import_chunk_XFO6D2LG = require("./chunk-XFO6D2LG.cjs");
-var import_chunk_YCDM2SZM = require("./chunk-YCDM2SZM.cjs");
+var import_chunk_VW2P26MZ = require("./chunk-VW2P26MZ.cjs");
+var import_chunk_2CB5AVBL = require("./chunk-2CB5AVBL.cjs");
 var import_chunk_IC2NICNC = require("./chunk-IC2NICNC.cjs");
 var import_react = __toESM(require("react"));
 var import_app_framework = require("@dxos/app-framework");
+var import_echo_schema = require("@dxos/echo-schema");
 var import_local_storage = require("@dxos/local-storage");
 var import_log = require("@dxos/log");
-var import_plugin_client = require("@dxos/plugin-client");
+var import_types = require("@dxos/plugin-client/types");
 var import_plugin_graph = require("@dxos/plugin-graph");
-var import_meta = require("@dxos/plugin-observability/meta");
+var import_types2 = require("@dxos/plugin-observability/types");
 var import_plugin_space = require("@dxos/plugin-space");
-var import_types = require("@dxos/plugin-space/types");
+var import_types3 = require("@dxos/plugin-space/types");
 var import_echo = 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_live_object = require("@dxos/live-object");
-var import_types2 = require("@dxos/plugin-space/types");
+var import_types4 = require("@dxos/plugin-space/types");
 var import_echo2 = require("@dxos/react-client/echo");
 var import_halo = require("@dxos/react-client/halo");
 var import_react_ui = require("@dxos/react-ui");
@@ -77,11 +78,13 @@ var import_react_ui3 = require("@dxos/react-ui");
 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_app_framework3 = require("@dxos/app-framework");
+var import_echo_schema2 = require("@dxos/echo-schema");
+var import_live_object2 = require("@dxos/live-object");
+var import_types5 = 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 import_types4 = require("@dxos/plugin-space/types");
+var import_types6 = 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 }) => {
@@ -104,9 +107,7 @@ var ToggleResolvedButton = ({ isResolved, onResolve }) => {
     weight: "fill"
   }) : /* @__PURE__ */ import_react4.default.createElement(import_react3.CheckCircle, {
     className: sizeClass
-  }))), /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Portal, null, /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Content, {
-    classNames: "z-[21]"
-  }, label, /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Arrow, null))));
+  }))), /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Portal, null, /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Content, null, label, /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Arrow, null))));
 };
 var DeleteThreadButton = ({ onDelete }) => {
   const { t } = (0, import_react_ui.useTranslation)(import_chunk_IC2NICNC.THREAD_PLUGIN);
@@ -126,18 +127,18 @@ var DeleteThreadButton = ({ onDelete }) => {
   }, label), /* @__PURE__ */ import_react4.default.createElement(import_react3.X, {
     className: sizeClass
   }))), /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Portal, null, /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Content, {
-    classNames: "z-[21]"
+    classNames: "z-30"
   }, label, /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Arrow, null))));
 };
 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_YCDM2SZM.useStatus)(space, (0, import_echo2.fullyQualifiedId)(thread));
+  const activity = (0, import_chunk_2CB5AVBL.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_YCDM2SZM.getMessageMetadata)((0, import_echo2.fullyQualifiedId)(thread), identity);
+  const textboxMetadata = (0, import_chunk_2CB5AVBL.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 +152,7 @@ var CommentContainer = ({ thread, detached, context, current, onAttend, onThread
     (0, import_react_ui_editor.listener)({
       onChange: (text) => messageRef.current = text
     }),
-    import_chunk_YCDM2SZM.command
+    import_chunk_2CB5AVBL.command
   ], [
     _count
   ]);
@@ -163,14 +164,14 @@ var CommentContainer = ({ thread, detached, context, current, onAttend, onThread
     if (!messageRef.current) {
       return false;
     }
-    thread.messages.push((0, import_live_object.create)(import_types2.MessageType, {
+    thread.messages.push((0, import_live_object.makeRef)((0, import_live_object.create)(import_types4.MessageType, {
       sender: {
         identityKey: identity.identityKey.toHex()
       },
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       text: messageRef.current,
-      context
-    }));
+      context: context ? (0, import_live_object.makeRef)(context) : void 0
+    })));
     onComment?.(thread);
     messageRef.current = "";
     scrollToEnd("instant");
@@ -193,7 +194,7 @@ var CommentContainer = ({ thread, detached, context, current, onAttend, onThread
   }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui_thread2.ThreadHeading, {
     detached: true
   }, thread.name)), /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Portal, null, /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Content, {
-    classNames: "z-[21]",
+    classNames: "z-30",
     side: "top"
   }, t("detached thread label"), /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Tooltip.Arrow, null)))) : /* @__PURE__ */ import_react4.default.createElement(import_react_ui_thread2.ThreadHeading, null, thread.name), /* @__PURE__ */ import_react4.default.createElement("div", {
     className: "flex flex-row items-center pli-1"
@@ -204,7 +205,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_YCDM2SZM.MessageContainer, {
+  }))), import_live_object.RefArray.allResolvedTargets(thread.messages?.filter(import_util.nonNullable) ?? []).map((message) => /* @__PURE__ */ import_react4.default.createElement(import_chunk_2CB5AVBL.MessageContainer, {
     key: message.id,
     message,
     members,
@@ -271,8 +272,8 @@ var CommentsContainer = ({ threads: threads2, detached = [], currentId, showReso
   }))));
 };
 var providesThreadsConfig = (plugin) => "thread" in plugin.provides ? plugin : void 0;
-var ThreadComplementary = ({ role, subject, drafts, current, showResolvedThreads }) => {
-  const dispatch = (0, import_app_framework2.useIntentDispatcher)();
+var ThreadComplementary = ({ subject, drafts, current, showResolvedThreads }) => {
+  const { dispatchPromise: dispatch } = (0, import_app_framework2.useIntentDispatcher)();
   const threadsIntegrators = (0, import_app_framework2.useResolvePlugins)(providesThreadsConfig);
   const threadProvides = (0, import_react7.useMemo)(() => threadsIntegrators.map((p) => p.provides.thread), [
     threadsIntegrators
@@ -285,10 +286,11 @@ var ThreadComplementary = ({ role, subject, drafts, current, showResolvedThreads
     createSort,
     subject
   ]);
+  const threadObjects = import_echo4.RefArray.allResolvedTargets(subject.threads ?? []);
   const threads2 = (0, import_react7.useMemo)(() => {
-    return subject.threads.concat(drafts ?? []).filter(import_util2.nonNullable);
+    return threadObjects.concat(drafts ?? []).filter(import_util2.nonNullable);
   }, [
-    JSON.stringify(subject.threads),
+    JSON.stringify(threadObjects),
     JSON.stringify(drafts)
   ]);
   const detachedIds = (0, import_react7.useMemo)(() => {
@@ -316,53 +318,29 @@ var ThreadComplementary = ({ role, subject, drafts, current, showResolvedThreads
       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
-            }
-          }
-        ]);
+        void dispatch?.((0, import_app_framework2.createIntent)(import_app_framework2.LayoutAction.ScrollIntoView, {
+          id: (0, import_echo4.fullyQualifiedId)(subject),
+          cursor: thread.anchor,
+          ref: threadId
+        }));
       }
     },
-    onThreadDelete: (thread) => {
-      return dispatch({
-        plugin: import_chunk_IC2NICNC.THREAD_PLUGIN,
-        action: import_chunk_XFO6D2LG.ThreadAction.DELETE,
-        data: {
-          subject,
-          thread
-        }
-      });
-    },
-    onMessageDelete: (thread, messageId) => dispatch({
-      plugin: import_chunk_IC2NICNC.THREAD_PLUGIN,
-      action: import_chunk_XFO6D2LG.ThreadAction.DELETE_MESSAGE,
-      data: {
-        subject,
-        thread,
-        messageId
-      }
-    }),
-    onThreadToggleResolved: (thread) => dispatch({
-      plugin: import_chunk_IC2NICNC.THREAD_PLUGIN,
-      action: import_chunk_XFO6D2LG.ThreadAction.TOGGLE_RESOLVED,
-      data: {
-        thread
-      }
-    }),
-    onComment: (thread) => {
-      void dispatch({
-        action: import_chunk_XFO6D2LG.ThreadAction.ON_MESSAGE_ADD,
-        data: {
-          thread,
-          subject
-        }
-      });
-    }
+    onThreadDelete: (thread) => dispatch((0, import_app_framework2.createIntent)(import_chunk_VW2P26MZ.ThreadAction.Delete, {
+      thread,
+      subject
+    })),
+    onMessageDelete: (thread, messageId) => dispatch((0, import_app_framework2.createIntent)(import_chunk_VW2P26MZ.ThreadAction.DeleteMessage, {
+      thread,
+      subject,
+      messageId
+    })),
+    onThreadToggleResolved: (thread) => dispatch((0, import_app_framework2.createIntent)(import_chunk_VW2P26MZ.ThreadAction.ToggleResolved, {
+      thread
+    })),
+    onComment: (thread) => dispatch((0, import_app_framework2.createIntent)(import_chunk_VW2P26MZ.ThreadAction.OnMessageAdd, {
+      thread,
+      subject
+    }))
   });
 };
 var ThreadSettings = ({ settings }) => {
@@ -374,12 +352,12 @@ var ThreadSettings = ({ settings }) => {
     onCheckedChange: (checked) => settings.standalone = !!checked
   })));
 };
-var ThreadMain = (0, import_react2.lazy)(() => import("./ThreadMain-MRNJC3TI.cjs"));
-var ThreadArticle = (0, import_react2.lazy)(() => import("./ThreadArticle-I7ADXDW3.cjs"));
+var ThreadMain = (0, import_react2.lazy)(() => import("./ThreadMain-5AYGCXXP.cjs"));
+var ThreadArticle = (0, import_react2.lazy)(() => import("./ThreadArticle-ZCNMFBAO.cjs"));
 var getName = (doc, anchor) => {
   if (doc.content) {
     const [start, end] = anchor.split(":");
-    return (0, import_echo5.getTextInRange)((0, import_echo5.createDocAccessor)(doc.content, [
+    return (0, import_echo5.getTextInRange)((0, import_echo5.createDocAccessor)(doc.content.target, [
       "content"
     ]), start, end);
   }
@@ -392,14 +370,14 @@ var threads = (state, doc, dispatch) => {
     ];
   }
   const threads2 = (0, import_signals_core.computed)(() => [
-    ...doc.threads.filter(import_util3.nonNullable),
+    ...import_live_object2.RefArray.allResolvedTargets(doc.threads),
     ...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) {
+        import_live_object2.RefArray.allResolvedTargets(doc.threads).forEach((thread) => {
+          if (thread.anchor) {
             const name = getName(doc, thread.anchor);
             if (name && name !== thread.name) {
               thread.name = name;
@@ -416,14 +394,11 @@ var threads = (state, doc, dispatch) => {
       id: (0, import_echo5.fullyQualifiedId)(doc),
       onCreate: ({ cursor }) => {
         const name = getName(doc, cursor);
-        void dispatch({
-          action: import_chunk_XFO6D2LG.ThreadAction.CREATE,
-          data: {
-            cursor,
-            name,
-            subject: doc
-          }
-        });
+        void dispatch((0, import_app_framework3.createIntent)(import_chunk_VW2P26MZ.ThreadAction.Create, {
+          cursor,
+          name,
+          subject: doc
+        }));
       },
       onDelete: ({ id }) => {
         const draft = state.drafts[(0, import_echo5.fullyQualifiedId)(doc)];
@@ -433,26 +408,26 @@ var threads = (state, doc, dispatch) => {
             draft.splice(index, 1);
           }
         }
-        const thread = doc.threads.find((thread2) => thread2?.id === id);
+        const thread = doc.threads.find(import_echo_schema2.Ref.hasObjectId(id))?.target;
         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) {
+        const thread = state.drafts[(0, import_echo5.fullyQualifiedId)(doc)]?.find((thread2) => (0, import_echo5.fullyQualifiedId)(thread2) === id) ?? doc.threads.find(import_echo_schema2.Ref.hasObjectId(id))?.target;
+        if (thread instanceof import_types5.ThreadType && thread.anchor) {
           thread.name = getName(doc, thread.anchor);
           thread.anchor = cursor;
         }
       },
-      onSelect: ({ selection: { current, closest } }) => {
-        void dispatch({
-          action: import_chunk_XFO6D2LG.ThreadAction.SELECT,
-          data: {
-            current: current ?? closest,
+      onSelect: ({ selection }) => {
+        const current = selection.current ?? selection.closest;
+        if (current) {
+          void dispatch((0, import_app_framework3.createIntent)(import_chunk_VW2P26MZ.ThreadAction.Select, {
+            current,
             skipOpen: true
-          }
-        });
+          }));
+        }
       }
     })
   ];
@@ -460,7 +435,7 @@ var threads = (state, doc, dispatch) => {
 var translations_default = [
   {
     "en-US": {
-      [import_types4.ChannelType.typename]: {
+      [import_types6.ChannelType.typename]: {
         "typename label": "Channel"
       },
       [import_chunk_IC2NICNC.THREAD_PLUGIN]: {
@@ -513,7 +488,6 @@ var ThreadPlugin = () => {
     }
     return viewStore[subjectId];
   };
-  let navigationPlugin;
   let intentPlugin;
   const unsubscribeCallbacks = [];
   return {
@@ -528,20 +502,19 @@ var ThreadPlugin = () => {
       return {
         echo: {
           system: [
-            import_types.ThreadType,
-            import_types.MessageType
+            import_types3.ThreadType,
+            import_types3.MessageType
           ],
           // TODO(wittjosiah): Requires reload.
           ...settings.values.standalone ? {
             schema: [
-              import_types.ChannelType
+              import_types3.ChannelType
             ]
           } : {}
         }
       };
     },
-    ready: async (plugins) => {
-      navigationPlugin = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseNavigationPlugin);
+    ready: async ({ plugins }) => {
       intentPlugin = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseIntentPlugin);
     },
     unload: async () => {
@@ -551,8 +524,8 @@ var ThreadPlugin = () => {
       settings: settings.values,
       metadata: {
         records: {
-          [import_types.ChannelType.typename]: {
-            createObject: import_chunk_XFO6D2LG.ThreadAction.CREATE,
+          [import_types3.ChannelType.typename]: {
+            createObject: (props) => (0, import_app_framework.createIntent)(import_chunk_VW2P26MZ.ThreadAction.Create, props),
             placeholder: [
               "channel name placeholder",
               {
@@ -561,13 +534,13 @@ var ThreadPlugin = () => {
             ],
             icon: "ph--chat--regular",
             // TODO(wittjosiah): Move out of metadata.
-            loadReferences: (channel) => (0, import_echo.loadObjectReferences)(channel, (channel2) => channel2.threads)
+            loadReferences: async (channel) => await import_echo.RefArray.loadAll(channel.threads ?? [])
           },
-          [import_types.ThreadType.typename]: {
+          [import_types3.ThreadType.typename]: {
             // TODO(wittjosiah): Move out of metadata.
-            loadReferences: (thread) => (0, import_echo.loadObjectReferences)(thread, (thread2) => thread2.messages)
+            loadReferences: async (thread) => await import_echo.RefArray.loadAll(thread.messages ?? [])
           },
-          [import_types.MessageType.typename]: {
+          [import_types3.MessageType.typename]: {
             // TODO(wittjosiah): Move out of metadata.
             loadReferences: (message) => []
           },
@@ -612,8 +585,8 @@ var ThreadPlugin = () => {
       },
       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 client = (0, import_app_framework.resolvePlugin)(plugins, import_types.parseClientPlugin)?.provides.client;
+          const dispatch = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseIntentPlugin)?.provides.intent.dispatchPromise;
           const metadataResolver = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseMetadataResolverPlugin)?.provides.metadata.resolver;
           if (!client || !dispatch || !metadataResolver) {
             return [];
@@ -683,20 +656,17 @@ var ThreadPlugin = () => {
                 }
                 const [spaceId, objectId] = dataId.split(":");
                 const viewState = getViewState(dataId);
-                const toggle = () => {
+                const toggle = async () => {
                   const newToggleState = !viewState.showResolvedThreads;
                   viewState.showResolvedThreads = newToggleState;
-                  void dispatch({
-                    action: import_meta.ObservabilityAction.SEND_EVENT,
-                    data: {
-                      name: "threads.toggle-show-resolved",
-                      properties: {
-                        spaceId,
-                        threadId: objectId,
-                        showResolved: newToggleState
-                      }
+                  await dispatch((0, import_app_framework.createIntent)(import_types2.ObservabilityAction.SendEvent, {
+                    name: "threads.toggle-show-resolved",
+                    properties: {
+                      spaceId,
+                      threadId: objectId,
+                      showResolved: newToggleState
                     }
-                  });
+                  }));
                 };
                 return [
                   {
@@ -717,440 +687,315 @@ var ThreadPlugin = () => {
                   }
                 ];
               }
-            }),
-            (0, import_plugin_graph.createExtension)({
-              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);
-                const [spaceId, objectId] = id?.split(":") ?? [];
-                const space = client.spaces.get().find((space2) => space2.id === spaceId);
-                const object = objectId && space?.db.getObjectById(objectId);
-                const target = objectId ? object : space;
-                if (!target) {
-                  return;
-                }
-                return [
-                  {
-                    id: `${import_chunk_IC2NICNC.THREAD_PLUGIN}/create/${node.id}`,
-                    data: async () => {
-                      await dispatch([
-                        {
-                          plugin: import_chunk_IC2NICNC.THREAD_PLUGIN,
-                          action: import_chunk_XFO6D2LG.ThreadAction.CREATE
-                        },
-                        {
-                          action: import_plugin_space.SpaceAction.ADD_OBJECT,
-                          data: {
-                            target
-                          }
-                        },
-                        {
-                          action: import_app_framework.NavigationAction.OPEN
-                        }
-                      ]);
-                    },
-                    properties: {
-                      label: [
-                        "create channel label",
-                        {
-                          ns: import_chunk_IC2NICNC.THREAD_PLUGIN
-                        }
-                      ],
-                      icon: "ph--chat--regular",
-                      testId: "threadPlugin.createObject"
-                    }
-                  }
-                ];
-              }
             })
           ];
         }
       },
       surface: {
-        component: ({ data, role }) => {
-          switch (role) {
-            case "main": {
-              return data.active instanceof import_types.ChannelType && data.active.threads[0] ? /* @__PURE__ */ import_react.default.createElement(ThreadMain, {
-                thread: data.active.threads[0]
-              }) : null;
-            }
-            case "settings": {
-              return data.plugin === import_chunk_IC2NICNC.meta_default.id ? /* @__PURE__ */ import_react.default.createElement(ThreadSettings, {
-                settings: settings.values
-              }) : null;
-            }
-            case "article": {
-              const location = navigationPlugin?.provides.location;
-              if (data.object instanceof import_types.ChannelType && data.object.threads[0]) {
-                const channel = data.object;
+        definitions: ({ plugins }) => {
+          const location = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseNavigationPlugin)?.provides.location;
+          return [
+            (0, import_app_framework.createSurface)({
+              id: `${import_chunk_IC2NICNC.THREAD_PLUGIN}/channel`,
+              role: "article",
+              filter: (data) => data.subject instanceof import_types3.ChannelType && !!data.subject.threads[0],
+              component: ({ data }) => {
+                const channel = data.subject;
+                const thread = channel.threads[0].target;
                 if ((0, import_app_framework.isLayoutParts)(location?.active) && location.active.main) {
                   const layoutEntries = location.active.main;
                   const currentPosition = layoutEntries.findIndex((entry) => channel.id === entry.id);
                   if (currentPosition > 0) {
                     const objectToTheLeft = layoutEntries[currentPosition - 1];
-                    const context = (0, import_echo.getSpace)(data.object)?.db.getObjectById(objectToTheLeft.id);
+                    const context = (0, import_echo.getSpace)(channel)?.db.getObjectById(objectToTheLeft.id);
                     return /* @__PURE__ */ import_react.default.createElement(ThreadArticle, {
-                      thread: data.object.threads[0],
+                      thread,
                       context
                     });
                   }
                 }
                 return /* @__PURE__ */ import_react.default.createElement(ThreadArticle, {
-                  thread: data.object.threads[0]
+                  thread
                 });
               }
-              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_YCDM2SZM.ChatHeading, {
-                  attendableId: data.subject.id
-                }), /* @__PURE__ */ import_react.default.createElement(import_chunk_YCDM2SZM.ChatContainer, {
-                  thread: data.subject
-                }));
-              }
-              break;
-            }
-            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)) {
+            }),
+            (0, import_app_framework.createSurface)({
+              id: `${import_chunk_IC2NICNC.THREAD_PLUGIN}/thread`,
+              role: "complementary--comments",
+              filter: (data) => !!data.subject && typeof data.subject === "object" && "threads" in data.subject && Array.isArray(data.subject.threads) && !(data.subject instanceof import_types3.ChannelType),
+              component: ({ data }) => {
                 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_echo.fullyQualifiedId)(data.subject)],
                   current: state.current,
                   showResolvedThreads
                 });
               }
-              break;
-            }
-          }
-          return null;
+            }),
+            (0, import_app_framework.createSurface)({
+              id: `${import_chunk_IC2NICNC.THREAD_PLUGIN}/settings`,
+              role: "settings",
+              filter: (data) => data.plugin === import_chunk_IC2NICNC.THREAD_PLUGIN,
+              component: () => /* @__PURE__ */ import_react.default.createElement(ThreadSettings, {
+                settings: settings.values
+              })
+            })
+          ];
         }
       },
       intent: {
-        resolver: async (intent) => {
-          switch (intent.action) {
-            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) {
-                  try {
-                    subject.threads = [];
-                  } catch (err) {
-                    import_log.log.error("Subject does not support threads array", subject?.typename, {
-                      F: __dxlog_file,
-                      L: 371,
-                      S: void 0,
-                      C: (f, a) => f(...a)
-                    });
-                    return;
-                  }
-                }
-                const subjectId = (0, import_echo.fullyQualifiedId)(subject);
-                const thread = (0, import_echo.create)(import_types.ThreadType, {
-                  name,
-                  anchor: cursor,
-                  messages: [],
-                  status: "staged"
-                });
-                const draft = state.drafts[subjectId];
-                if (draft) {
-                  draft.push(thread);
-                } else {
-                  state.drafts[subjectId] = [
-                    thread
-                  ];
+        resolvers: () => [
+          (0, import_app_framework.createResolver)(import_chunk_VW2P26MZ.ThreadAction.Create, ({ name, cursor, subject }) => {
+            if (cursor && subject) {
+              if (subject?.threads === void 0) {
+                try {
+                  subject.threads = [];
+                } catch (err) {
+                  import_log.log.error("Subject does not support threads array", subject?.typename, {
+                    F: __dxlog_file,
+                    L: 314,
+                    S: void 0,
+                    C: (f, a) => f(...a)
+                  });
+                  return;
                 }
-                return {
-                  data: thread,
-                  intents: [
-                    [
-                      {
-                        action: import_chunk_XFO6D2LG.ThreadAction.SELECT,
-                        data: {
-                          current: (0, import_echo.fullyQualifiedId)(thread)
-                        }
-                      }
-                    ],
-                    [
-                      {
-                        action: import_app_framework.NavigationAction.OPEN,
-                        data: {
-                          activeParts: {
-                            complementary: "comments"
-                          }
-                        }
-                      }
-                    ],
-                    [
-                      {
-                        action: import_app_framework.LayoutAction.SET_LAYOUT,
-                        data: {
-                          element: "complementary",
-                          state: true
-                        }
-                      }
-                    ]
-                  ]
-                };
+              }
+              const subjectId = (0, import_echo.fullyQualifiedId)(subject);
+              const thread = (0, import_echo.create)(import_types3.ThreadType, {
+                name,
+                anchor: cursor,
+                messages: [],
+                status: "staged"
+              });
+              const draft = state.drafts[subjectId];
+              if (draft) {
+                draft.push(thread);
               } else {
-                return {
-                  data: (0, import_echo.create)(import_types.ChannelType, {
+                state.drafts[subjectId] = [
+                  thread
+                ];
+              }
+              return {
+                data: {
+                  object: thread
+                },
+                intents: [
+                  (0, import_app_framework.createIntent)(import_chunk_VW2P26MZ.ThreadAction.Select, {
+                    current: (0, import_echo.fullyQualifiedId)(thread)
+                  }),
+                  (0, import_app_framework.createIntent)(import_app_framework.NavigationAction.Open, {
+                    activeParts: {
+                      complementary: "comments"
+                    }
+                  }),
+                  (0, import_app_framework.createIntent)(import_app_framework.LayoutAction.SetLayout, {
+                    element: "complementary",
+                    state: true
+                  })
+                ]
+              };
+            } else {
+              return {
+                data: {
+                  object: (0, import_echo.create)(import_types3.ChannelType, {
                     threads: [
-                      (0, import_echo.create)(import_types.ThreadType, {
+                      (0, import_echo.makeRef)((0, import_echo.create)(import_types3.ThreadType, {
                         messages: []
-                      })
+                      }))
                     ]
                   })
-                };
+                }
+              };
+            }
+          }),
+          (0, import_app_framework.createResolver)(import_chunk_VW2P26MZ.ThreadAction.Select, ({ current, skipOpen }) => {
+            state.current = current;
+            return {
+              intents: !skipOpen ? [
+                (0, import_app_framework.createIntent)(import_app_framework.NavigationAction.Open, {
+                  activeParts: {
+                    complementary: "comments"
+                  }
+                })
+              ] : void 0
+            };
+          }),
+          (0, import_app_framework.createResolver)(import_chunk_VW2P26MZ.ThreadAction.ToggleResolved, ({ thread }) => {
+            if (thread.status === "active" || thread.status === void 0) {
+              thread.status = "resolved";
+            } else if (thread.status === "resolved") {
+              thread.status = "active";
+            }
+            const space = (0, import_echo.getSpace)(thread);
+            const spaceId = space?.id;
+            return {
+              intents: [
+                (0, import_app_framework.createIntent)(import_types2.ObservabilityAction.SendEvent, {
+                  name: "threads.toggle-resolved",
+                  properties: {
+                    threadId: thread.id,
+                    spaceId
+                  }
+                })
+              ]
+            };
+          }),
+          (0, import_app_framework.createResolver)(import_chunk_VW2P26MZ.ThreadAction.Delete, ({ subject, thread }, undo) => {
+            const subjectId = (0, import_echo.fullyQualifiedId)(subject);
+            const draft = state.drafts[subjectId];
+            if (draft) {
+              const index = draft.findIndex((t) => t.id === thread.id);
+              if (index !== -1) {
+                draft.splice(index, 1);
+                return;
               }
             }
-            case import_chunk_XFO6D2LG.ThreadAction.SELECT: {
-              state.current = intent.data?.current;
+            const space = (0, import_echo.getSpace)(thread);
+            if (!space || !subject.threads) {
+              return;
+            }
+            if (!undo) {
+              const index = subject.threads.findIndex((t) => t?.id === thread.id);
+              const cursor = subject.threads[index]?.anchor;
+              if (index !== -1) {
+                subject.threads?.splice(index, 1);
+              }
+              space.db.remove(thread);
               return {
-                data: true,
-                intents: !intent.data?.skipOpen ? [
-                  [
+                undoable: {
+                  message: [
+                    "thread deleted label",
                     {
-                      action: import_app_framework.NavigationAction.OPEN,
-                      data: {
-                        activeParts: {
-                          complementary: "comments"
-                        }
-                      }
+                      ns: import_chunk_IC2NICNC.THREAD_PLUGIN
                     }
-                  ]
-                ] : []
+                  ],
+                  data: {
+                    cursor
+                  }
+                },
+                intents: [
+                  (0, import_app_framework.createIntent)(import_types2.ObservabilityAction.SendEvent, {
+                    name: "threads.delete",
+                    properties: {
+                      threadId: thread.id,
+                      spaceId: space.id
+                    }
+                  })
+                ]
               };
-            }
-            case import_chunk_XFO6D2LG.ThreadAction.TOGGLE_RESOLVED: {
-              const { thread } = intent.data ?? {};
-              if (!(thread instanceof import_types.ThreadType)) {
-                return;
-              }
-              if (thread.status === "active" || thread.status === void 0) {
-                thread.status = "resolved";
-              } else if (thread.status === "resolved") {
-                thread.status = "active";
-              }
-              const space = (0, import_echo.getSpace)(thread);
-              const spaceId = space?.id;
+            } else {
+              const savedThread = space.db.add(thread);
+              subject.threads.push(savedThread);
               return {
-                data: true,
                 intents: [
-                  [
-                    {
-                      action: import_meta.ObservabilityAction.SEND_EVENT,
-                      data: {
-                        name: "threads.toggle-resolved",
-                        properties: {
-                          threadId: thread.id,
-                          spaceId
-                        }
-                      }
+                  (0, import_app_framework.createIntent)(import_types2.ObservabilityAction.SendEvent, {
+                    name: "threads.undo-delete",
+                    properties: {
+                      threadId: thread.id,
+                      spaceId: space.id
                     }
-                  ]
+                  })
                 ]
               };
             }
-            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_echo.fullyQualifiedId)(subject);
-              const draft = state.drafts[subjectId];
-              if (draft) {
-                const index = draft.findIndex((t) => t.id === thread.id);
-                if (index !== -1) {
-                  draft.splice(index, 1);
-                  return {
-                    data: true
-                  };
-                }
+          }),
+          (0, import_app_framework.createResolver)(import_chunk_VW2P26MZ.ThreadAction.OnMessageAdd, ({ thread, subject }) => {
+            const subjectId = (0, import_echo.fullyQualifiedId)(subject);
+            const space = (0, import_echo.getSpace)(subject);
+            const intents = [];
+            const analyticsProperties = {
+              threadId: thread.id,
+              spaceId: space?.id
+            };
+            if (state.drafts[subjectId]?.find((t) => t === thread)) {
+              thread.status = "active";
+              subject.threads ? subject.threads.push((0, import_echo.makeRef)(thread)) : subject.threads = [
+                (0, import_echo.makeRef)(thread)
+              ];
+              state.drafts[subjectId] = state.drafts[subjectId]?.filter(({ id }) => id !== thread.id);
+              intents.push((0, import_app_framework.createIntent)(import_types2.ObservabilityAction.SendEvent, {
+                name: "threads.thread-created",
+                properties: analyticsProperties
+              }));
+            }
+            intents.push((0, import_app_framework.createIntent)(import_types2.ObservabilityAction.SendEvent, {
+              name: "threads.message-added",
+              properties: {
+                ...analyticsProperties,
+                threadLength: thread.messages.length
               }
-              const space = (0, import_echo.getSpace)(thread);
-              if (!space || !subject.threads) {
+            }));
+            return {
+              intents
+            };
+          }),
+          (0, import_app_framework.createResolver)(import_chunk_VW2P26MZ.ThreadAction.DeleteMessage, ({ subject, thread, messageId, message, messageIndex }, undo) => {
+            const space = (0, import_echo.getSpace)(subject);
+            if (!undo) {
+              const messageIndex2 = thread.messages.findIndex(import_echo_schema.Ref.hasObjectId(messageId));
+              const message2 = thread.messages[messageIndex2]?.target;
+              if (!message2) {
                 return;
               }
-              if (!intent.undo) {
-                const index = subject.threads.findIndex((t) => t?.id === thread.id);
-                const cursor = subject.threads[index]?.anchor;
-                if (index !== -1) {
-                  subject.threads?.splice(index, 1);
-                }
-                space.db.remove(thread);
+              if (messageIndex2 === 0 && thread.messages.length === 1) {
                 return {
-                  undoable: {
-                    message: translations_default[0]["en-US"][import_chunk_IC2NICNC.THREAD_PLUGIN]["thread deleted label"],
-                    data: {
-                      cursor
-                    }
-                  },
                   intents: [
-                    [
-                      {
-                        action: import_meta.ObservabilityAction.SEND_EVENT,
-                        data: {
-                          name: "threads.delete",
-                          properties: {
-                            threadId: thread.id,
-                            spaceId: space.id
-                          }
-                        }
-                      }
-                    ]
-                  ]
-                };
-              } else if (intent.undo) {
-                const savedThread = space.db.add(thread);
-                subject.threads.push(savedThread);
-                return {
-                  data: true,
-                  intents: [
-                    [
-                      {
-                        action: import_meta.ObservabilityAction.SEND_EVENT,
-                        data: {
-                          name: "threads.undo-delete",
-                          properties: {
-                            threadId: thread.id,
-                            spaceId: space.id
-                          }
-                        }
-                      }
-                    ]
+                    (0, import_app_framework.createIntent)(import_chunk_VW2P26MZ.ThreadAction.Delete, {
+                      subject,
+                      thread
+                    })
                   ]
                 };
+              } else {
+                thread.messages.splice(messageIndex2, 1);
               }
-              break;
-            }
-            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_echo.fullyQualifiedId)(subject);
-              const space = (0, import_echo.getSpace)(subject);
-              const intents = [];
-              const analyticsProperties = {
-                threadId: thread.id,
-                spaceId: space?.id
-              };
-              if (state.drafts[subjectId]?.find((t) => t === thread)) {
-                thread.status = "active";
-                subject.threads ? subject.threads.push(thread) : subject.threads = [
-                  thread
-                ];
-                state.drafts[subjectId] = state.drafts[subjectId]?.filter(({ id }) => id !== thread.id);
-                intents.push({
-                  action: import_meta.ObservabilityAction.SEND_EVENT,
+              return {
+                undoable: {
+                  message: [
+                    "message deleted label",
+                    {
+                      ns: import_chunk_IC2NICNC.THREAD_PLUGIN
+                    }
+                  ],
                   data: {
-                    name: "threads.thread-created",
-                    properties: analyticsProperties
+                    message: message2,
+                    messageIndex: messageIndex2
                   }
-                });
-              }
-              intents.push({
-                action: import_meta.ObservabilityAction.SEND_EVENT,
-                data: {
-                  name: "threads.message-added",
-                  properties: {
-                    ...analyticsProperties,
-                    threadLength: thread.messages.length
-                  }
-                }
-              });
-              return {
-                data: thread,
+                },
                 intents: [
-                  intents
+                  (0, import_app_framework.createIntent)(import_types2.ObservabilityAction.SendEvent, {
+                    name: "threads.message.delete",
+                    properties: {
+                      threadId: thread.id,
+                      spaceId: space?.id
+                    }
+                  })
                 ]
               };
-            }
-            case import_chunk_XFO6D2LG.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)) {
+            } else {
+              if (!messageIndex || !message) {
                 return;
               }
-              if (!intent.undo) {
-                const message = thread.messages.find((m) => m?.id === messageId);
-                const messageIndex = thread.messages.findIndex((m) => m?.id === messageId);
-                if (messageIndex === -1 || !message) {
-                  return void 0;
-                }
-                if (messageIndex === 0 && thread.messages.length === 1) {
-                  return {
-                    intents: [
-                      [
-                        {
-                          action: import_chunk_XFO6D2LG.ThreadAction.DELETE,
-                          data: {
-                            subject,
-                            thread
-                          }
-                        }
-                      ]
-                    ]
-                  };
-                } else {
-                  thread.messages.splice(messageIndex, 1);
-                }
-                return {
-                  undoable: {
-                    message: translations_default[0]["en-US"][import_chunk_IC2NICNC.THREAD_PLUGIN]["message deleted label"],
-                    data: {
-                      message,
-                      messageIndex
+              thread.messages.splice(messageIndex, 0, (0, import_echo.makeRef)(message));
+              return {
+                intents: [
+                  (0, import_app_framework.createIntent)(import_types2.ObservabilityAction.SendEvent, {
+                    name: "threads.message.undo-delete",
+                    properties: {
+                      threadId: thread.id,
+                      spaceId: space?.id
                     }
-                  },
-                  intents: [
-                    [
-                      {
-                        action: import_meta.ObservabilityAction.SEND_EVENT,
-                        data: {
-                          name: "threads.message.delete",
-                          properties: {
-                            threadId: thread.id,
-                            spaceId: space?.id
-                          }
-                        }
-                      }
-                    ]
-                  ]
-                };
-              } else if (intent.undo) {
-                const message = intent.data?.message;
-                const messageIndex = intent.data?.messageIndex;
-                if (!(message instanceof import_types.MessageType) || !(typeof messageIndex === "number")) {
-                  return;
-                }
-                thread.messages.splice(messageIndex, 0, message);
-                return {
-                  data: true,
-                  intents: [
-                    [
-                      {
-                        action: import_meta.ObservabilityAction.SEND_EVENT,
-                        data: {
-                          name: "threads.message.undo-delete",
-                          properties: {
-                            threadId: thread.id,
-                            spaceId: space?.id
-                          }
-                        }
-                      }
-                    ]
-                  ]
-                };
-              }
+                  })
+                ]
+              };
             }
-          }
-        }
+          })
+        ]
       },
       markdown: {
         extensions: ({ document: doc }) => {
-          return threads(state, doc, intentPlugin?.provides.intent.dispatch);
+          return threads(state, doc, intentPlugin?.provides.intent.dispatchPromise);
         }
       }
     }