@dxos/plugin-thread 0.6.12-main.7907542 → 0.6.12-main.c1d977f

package/dist/lib/browser/{ThreadArticle-4VU752F4.mjs → ThreadArticle-GBPIH47W.mjs}

@@ -1,7 +1,7 @@
 import {
   ChatContainer
-} from "./chunk-XF5QKI75.mjs";
-import "./chunk-7NUYW5IW.mjs";
+} from "./chunk-O4YRHIZC.mjs";
+import "./chunk-5G3KL6TC.mjs";
 
 // packages/plugins/plugin-thread/src/components/ThreadArticle.tsx
 import React from "react";
@@ -15,4 +15,4 @@ var ThreadArticle_default = ThreadArticle;
 export {
   ThreadArticle_default as default
 };
-//# sourceMappingURL=ThreadArticle-4VU752F4.mjs.map
+//# sourceMappingURL=ThreadArticle-GBPIH47W.mjs.map

package/dist/lib/browser/{ThreadMain-ML3P4XSD.mjs → ThreadMain-PGF7W5EV.mjs}

@@ -1,7 +1,7 @@
 import {
   ChatContainer
-} from "./chunk-XF5QKI75.mjs";
-import "./chunk-7NUYW5IW.mjs";
+} from "./chunk-O4YRHIZC.mjs";
+import "./chunk-5G3KL6TC.mjs";
 
 // packages/plugins/plugin-thread/src/components/ThreadMain.tsx
 import React from "react";
@@ -23,4 +23,4 @@ var ThreadMain_default = ThreadMain;
 export {
   ThreadMain_default as default
 };
-//# sourceMappingURL=ThreadMain-ML3P4XSD.mjs.map
+//# sourceMappingURL=ThreadMain-PGF7W5EV.mjs.map

package/dist/lib/browser/{chunk-7NUYW5IW.mjs → chunk-5G3KL6TC.mjs}

@@ -1,18 +1,16 @@
-// packages/plugins/plugin-thread/src/meta.tsx
-import { pluginMeta } from "@dxos/app-framework";
+// packages/plugins/plugin-thread/src/meta.ts
 var THREAD_PLUGIN = "dxos.org/plugin/thread";
 var THREAD_ITEM = `${THREAD_PLUGIN}/item`;
-var meta_default = pluginMeta({
+var meta_default = {
   id: THREAD_PLUGIN,
   name: "Threads",
-  // TODO(wittjosiah): Update once scope of threads expands.
   description: "Comment threads on documents.",
   icon: "ph--chat--regular"
-});
+};
 
 export {
   THREAD_PLUGIN,
   THREAD_ITEM,
   meta_default
 };
-//# sourceMappingURL=chunk-7NUYW5IW.mjs.map
+//# sourceMappingURL=chunk-5G3KL6TC.mjs.map

package/dist/lib/browser/chunk-5G3KL6TC.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/meta.ts"],
+  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { type PluginMeta } from '@dxos/app-framework';\n\nexport const THREAD_PLUGIN = 'dxos.org/plugin/thread';\nexport const THREAD_ITEM = `${THREAD_PLUGIN}/item`;\n\nexport default {\n  id: THREAD_PLUGIN,\n  name: 'Threads',\n  description: 'Comment threads on documents.',\n  icon: 'ph--chat--regular',\n} satisfies PluginMeta;\n"],
+  "mappings": ";AAMO,IAAMA,gBAAgB;AACtB,IAAMC,cAAc,GAAGD,aAAAA;AAE9B,IAAA,eAAe;EACbE,IAAIF;EACJG,MAAM;EACNC,aAAa;EACbC,MAAM;AACR;",
+  "names": ["THREAD_PLUGIN", "THREAD_ITEM", "id", "name", "description", "icon"]
+}

package/dist/lib/browser/{chunk-GJRBBPXI.mjs → chunk-JFQZ5W2I.mjs}

@@ -1,6 +1,6 @@
 import {
   THREAD_PLUGIN
-} from "./chunk-7NUYW5IW.mjs";
+} from "./chunk-5G3KL6TC.mjs";
 
 // packages/plugins/plugin-thread/src/types.ts
 var THREAD_ACTION = `${THREAD_PLUGIN}/action`;
@@ -17,4 +17,4 @@ var ThreadAction;
 export {
   ThreadAction
 };
-//# sourceMappingURL=chunk-GJRBBPXI.mjs.map
+//# sourceMappingURL=chunk-JFQZ5W2I.mjs.map

package/dist/lib/browser/{chunk-GJRBBPXI.mjs.map → chunk-JFQZ5W2I.mjs.map}

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/types.ts"],
-  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport type {\n  GraphBuilderProvides,\n  IntentResolverProvides,\n  MetadataRecordsProvides,\n  SettingsProvides,\n  SurfaceProvides,\n  TranslationsProvides,\n} from '@dxos/app-framework';\nimport { type SchemaProvides } from '@dxos/plugin-client';\nimport { type MarkdownExtensionProvides } from '@dxos/plugin-markdown';\nimport { type ThreadType } from '@dxos/plugin-space/types';\n\nimport { THREAD_PLUGIN } from './meta';\n\nconst THREAD_ACTION = `${THREAD_PLUGIN}/action`;\nexport enum ThreadAction {\n  CREATE = `${THREAD_ACTION}/create`,\n  SELECT = `${THREAD_ACTION}/select`,\n  DELETE = `${THREAD_ACTION}/delete`,\n  ON_MESSAGE_ADD = `${THREAD_ACTION}/on-message-add`,\n  DELETE_MESSAGE = `${THREAD_ACTION}/delete-message`,\n  TOGGLE_RESOLVED = `${THREAD_ACTION}/toggle-resolved`,\n}\n\n// TODO(Zan): Move this to the plugin-space plugin or another common location\n// when we implement threads in sheets.\nexport type ThreadProvides<T> = {\n  thread: {\n    predicate: (obj: any) => obj is T;\n    createSort: (obj: T) => (anchorA: string | undefined, anchorB: string | undefined) => number;\n  };\n};\n\nexport type ThreadPluginProvides = SurfaceProvides &\n  IntentResolverProvides &\n  GraphBuilderProvides &\n  MetadataRecordsProvides &\n  SettingsProvides &\n  TranslationsProvides &\n  SchemaProvides &\n  MarkdownExtensionProvides;\n\nexport type ThreadSettingsProps = { standalone?: boolean };\n\nexport interface ThreadModel {\n  root: ThreadType;\n}\n"],
+  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport type {\n  GraphBuilderProvides,\n  IntentResolverProvides,\n  MetadataRecordsProvides,\n  SettingsProvides,\n  SurfaceProvides,\n  TranslationsProvides,\n} from '@dxos/app-framework';\nimport { type SchemaProvides } from '@dxos/plugin-client';\nimport { type MarkdownExtensionProvides } from '@dxos/plugin-markdown';\nimport { type ThreadType } from '@dxos/plugin-space/types';\n\nimport { THREAD_PLUGIN } from './meta';\n\nconst THREAD_ACTION = `${THREAD_PLUGIN}/action`;\nexport enum ThreadAction {\n  CREATE = `${THREAD_ACTION}/create`,\n  SELECT = `${THREAD_ACTION}/select`,\n  DELETE = `${THREAD_ACTION}/delete`,\n  ON_MESSAGE_ADD = `${THREAD_ACTION}/on-message-add`,\n  DELETE_MESSAGE = `${THREAD_ACTION}/delete-message`,\n  TOGGLE_RESOLVED = `${THREAD_ACTION}/toggle-resolved`,\n}\n\n// TODO(Zan): Move this to the plugin-space plugin or another common location when we implement threads in sheets.\nexport type ThreadProvides<T> = {\n  thread: {\n    predicate: (obj: any) => obj is T;\n    createSort: (obj: T) => (anchorA: string | undefined, anchorB: string | undefined) => number;\n  };\n};\n\nexport type ThreadPluginProvides = SurfaceProvides &\n  IntentResolverProvides &\n  GraphBuilderProvides &\n  MetadataRecordsProvides &\n  SettingsProvides &\n  TranslationsProvides &\n  SchemaProvides &\n  MarkdownExtensionProvides;\n\nexport type ThreadSettingsProps = { standalone?: boolean };\n\nexport interface ThreadModel {\n  root: ThreadType;\n}\n\nexport type ThreadState = {\n  /** In-memory draft threads. */\n  drafts: Record<string, ThreadType[]>;\n  current?: string | undefined;\n};\n"],
   "mappings": ";;;;;AAkBA,IAAMA,gBAAgB,GAAGC,aAAAA;;UACbC,eAAAA;0CACD,GAAGF,aAAAA,SAAsB,IAAA;0CACzB,GAAGA,aAAAA,SAAsB,IAAA;0CACzB,GAAGA,aAAAA,SAAsB,IAAA;kDACjB,GAAGA,aAAAA,iBAA8B,IAAA;kDACjC,GAAGA,aAAAA,iBAA8B,IAAA;mDAChC,GAAGA,aAAAA,kBAA+B,IAAA;GAN1CE,iBAAAA,eAAAA,CAAAA,EAAAA;",
   "names": ["THREAD_ACTION", "THREAD_PLUGIN", "ThreadAction"]
 }

package/dist/lib/browser/{chunk-XF5QKI75.mjs → chunk-O4YRHIZC.mjs}

@@ -1,7 +1,7 @@
 import {
   THREAD_ITEM,
   THREAD_PLUGIN
-} from "./chunk-7NUYW5IW.mjs";
+} from "./chunk-5G3KL6TC.mjs";
 
 // packages/plugins/plugin-thread/src/hooks/useStatus.ts
 import { useEffect, useState } from "react";
@@ -409,4 +409,4 @@ export {
   ChatHeading,
   ChatContainer
 };
-//# sourceMappingURL=chunk-XF5QKI75.mjs.map
+//# sourceMappingURL=chunk-O4YRHIZC.mjs.map

package/dist/lib/browser/index.mjs

@@ -1,6 +1,6 @@
 import {
   ThreadAction
-} from "./chunk-GJRBBPXI.mjs";
+} from "./chunk-JFQZ5W2I.mjs";
 import {
   ChatContainer,
   ChatHeading,
@@ -10,17 +10,16 @@ import {
   useAnalyticsCallback,
   useOnEditAnalytics,
   useStatus
-} from "./chunk-XF5QKI75.mjs";
+} from "./chunk-O4YRHIZC.mjs";
 import {
   THREAD_ITEM,
   THREAD_PLUGIN,
   meta_default
-} from "./chunk-7NUYW5IW.mjs";
+} from "./chunk-5G3KL6TC.mjs";
 
 // packages/plugins/plugin-thread/src/ThreadPlugin.tsx
-import { computed, effect } from "@preact/signals-core";
 import React6 from "react";
-import { LayoutAction as LayoutAction2, NavigationAction, parseIntentPlugin, parseNavigationPlugin, resolvePlugin, isLayoutParts, parseMetadataResolverPlugin } from "@dxos/app-framework";
+import { NavigationAction, parseIntentPlugin, parseNavigationPlugin, resolvePlugin, isLayoutParts, parseMetadataResolverPlugin } from "@dxos/app-framework";
 import { getTypename } from "@dxos/echo-schema";
 import { create as create2 } from "@dxos/echo-schema";
 import { LocalStorageStore } from "@dxos/local-storage";
@@ -29,11 +28,9 @@ import { parseClientPlugin } from "@dxos/plugin-client";
 import { createExtension, isActionGroup, toSignal } from "@dxos/plugin-graph";
 import { ObservabilityAction } from "@dxos/plugin-observability/meta";
 import { SpaceAction } from "@dxos/plugin-space";
-import { ThreadType, MessageType as MessageType2, ChannelType } from "@dxos/plugin-space/types";
-import { getSpace as getSpace2, getTextInRange, createDocAccessor, fullyQualifiedId as fullyQualifiedId4, loadObjectReferences } from "@dxos/react-client/echo";
-import { comments, createExternalCommentSync, listener as listener2 } from "@dxos/react-ui-editor";
+import { ThreadType as ThreadType2, MessageType as MessageType2, ChannelType } from "@dxos/plugin-space/types";
+import { getSpace as getSpace3, fullyQualifiedId as fullyQualifiedId5, loadObjectReferences } from "@dxos/react-client/echo";
 import { translations as threadTranslations } from "@dxos/react-ui-thread";
-import { nonNullable as nonNullable3 } from "@dxos/util";
 
 // packages/plugins/plugin-thread/src/components/index.ts
 import React4 from "react";
@@ -209,9 +206,9 @@ import React3, { useEffect } from "react";
 import { fullyQualifiedId as fullyQualifiedId2 } from "@dxos/react-client/echo";
 import { useTranslation as useTranslation3, Trans } from "@dxos/react-ui";
 import { descriptionText, mx as mx2 } from "@dxos/react-ui-theme";
-var CommentsContainer = ({ threads, detached = [], currentId, showResolvedThreads, onThreadAttend, onThreadDelete, onMessageDelete, onThreadToggleResolved, ...props }) => {
+var CommentsContainer = ({ threads: threads2, detached = [], currentId, showResolvedThreads, onThreadAttend, onThreadDelete, onMessageDelete, onThreadToggleResolved, ...props }) => {
   const { t } = useTranslation3(THREAD_PLUGIN);
-  const filteredThreads = showResolvedThreads ? threads : threads.filter((thread) => !(thread?.status === "resolved"));
+  const filteredThreads = showResolvedThreads ? threads2 : threads2.filter((thread) => !(thread?.status === "resolved"));
   useEffect(() => {
     if (currentId) {
       document.getElementById(currentId)?.scrollIntoView({
@@ -260,8 +257,8 @@ var CommentsContainer = ({ threads, detached = [], currentId, showResolvedThread
 };
 
 // packages/plugins/plugin-thread/src/components/index.ts
-var ThreadMain = React4.lazy(() => import("./ThreadMain-ML3P4XSD.mjs"));
-var ThreadArticle = React4.lazy(() => import("./ThreadArticle-4VU752F4.mjs"));
+var ThreadMain = React4.lazy(() => import("./ThreadMain-PGF7W5EV.mjs"));
+var ThreadArticle = React4.lazy(() => import("./ThreadArticle-GBPIH47W.mjs"));
 
 // packages/plugins/plugin-thread/src/components/ThreadComplementary.tsx
 import React5, { useEffect as useEffect2, useMemo as useMemo2 } from "react";
@@ -271,7 +268,7 @@ import { ScrollArea } from "@dxos/react-ui";
 import { useAttended } from "@dxos/react-ui-attention";
 import { nonNullable as nonNullable2 } from "@dxos/util";
 var providesThreadsConfig = (plugin) => "thread" in plugin.provides ? plugin : void 0;
-var ThreadComplementary = ({ role, subject, stagedThreads, current, showResolvedThreads }) => {
+var ThreadComplementary = ({ role, subject, drafts, current, showResolvedThreads }) => {
   const dispatch = useIntentDispatcher();
   const threadsIntegrators = useResolvePlugins(providesThreadsConfig);
   const threadProvides = useMemo2(() => threadsIntegrators.map((p) => p.provides.thread), [
@@ -285,25 +282,25 @@ var ThreadComplementary = ({ role, subject, stagedThreads, current, showResolved
     createSort,
     subject
   ]);
-  const threads = useMemo2(() => {
-    return subject.threads.concat(stagedThreads ?? []).filter(nonNullable2);
+  const threads2 = useMemo2(() => {
+    return subject.threads.concat(drafts ?? []).filter(nonNullable2);
   }, [
     JSON.stringify(subject.threads),
-    JSON.stringify(stagedThreads)
+    JSON.stringify(drafts)
   ]);
   const detachedIds = useMemo2(() => {
-    return threads.filter(({ anchor }) => !anchor).map((thread) => fullyQualifiedId3(thread));
+    return threads2.filter(({ anchor }) => !anchor).map((thread) => fullyQualifiedId3(thread));
   }, [
-    threads
+    threads2
   ]);
   useEffect2(() => {
     if (!sort) {
       return;
     }
-    threads.sort((a, b) => sort(a?.anchor, b?.anchor));
+    threads2.sort((a, b) => sort(a?.anchor, b?.anchor));
   }, [
     sort,
-    threads
+    threads2
   ]);
   const attended = useAttended();
   const qualifiedSubjectId = fullyQualifiedId3(subject);
@@ -313,7 +310,7 @@ var ThreadComplementary = ({ role, subject, stagedThreads, current, showResolved
   }, /* @__PURE__ */ React5.createElement(ScrollArea.Root, {
     classNames: "row-span-2"
   }, /* @__PURE__ */ React5.createElement(ScrollArea.Viewport, null, /* @__PURE__ */ React5.createElement(CommentsContainer, {
-    threads,
+    threads: threads2,
     detached: detachedIds,
     currentId: attended.includes(qualifiedSubjectId) ? current : void 0,
     showResolvedThreads,
@@ -374,6 +371,95 @@ var ThreadComplementary = ({ role, subject, stagedThreads, current, showResolved
   }), /* @__PURE__ */ React5.createElement(ScrollArea.Scrollbar, null, /* @__PURE__ */ React5.createElement(ScrollArea.Thumb, null)))));
 };
 
+// packages/plugins/plugin-thread/src/extensions/threads.ts
+import { EditorView } from "@codemirror/view";
+import { computed, effect } from "@preact/signals-core";
+import { ThreadType } from "@dxos/plugin-space/types";
+import { getSpace as getSpace2, getTextInRange, createDocAccessor, fullyQualifiedId as fullyQualifiedId4 } from "@dxos/react-client/echo";
+import { comments, createExternalCommentSync } from "@dxos/react-ui-editor";
+import { nonNullable as nonNullable3 } from "@dxos/util";
+var getName = (doc, anchor) => {
+  if (doc.content) {
+    const [start, end] = anchor.split(":");
+    return getTextInRange(createDocAccessor(doc.content, [
+      "content"
+    ]), start, end);
+  }
+};
+var threads = (state, doc, dispatch) => {
+  const space = doc && getSpace2(doc);
+  if (!doc || !space || !dispatch) {
+    return [
+      comments()
+    ];
+  }
+  const threads2 = computed(() => [
+    ...doc.threads.filter(nonNullable3),
+    ...state.drafts[fullyQualifiedId4(doc)] ?? []
+  ].filter((thread) => !(thread?.status === "resolved")));
+  return [
+    EditorView.updateListener.of((update) => {
+      if (update.docChanged) {
+        doc.threads.forEach((thread) => {
+          if (thread?.anchor) {
+            const name = getName(doc, thread.anchor);
+            if (name && name !== thread.name) {
+              thread.name = name;
+            }
+          }
+        });
+      }
+    }),
+    createExternalCommentSync(fullyQualifiedId4(doc), (sink) => effect(() => sink()), () => threads2.value.filter((thread) => thread?.anchor).map((thread) => ({
+      id: fullyQualifiedId4(thread),
+      cursor: thread.anchor
+    }))),
+    comments({
+      id: fullyQualifiedId4(doc),
+      onCreate: ({ cursor }) => {
+        const name = getName(doc, cursor);
+        void dispatch({
+          action: ThreadAction.CREATE,
+          data: {
+            cursor,
+            name,
+            subject: doc
+          }
+        });
+      },
+      onDelete: ({ id }) => {
+        const draft = state.drafts[fullyQualifiedId4(doc)];
+        if (draft) {
+          const index = draft.findIndex((thread2) => fullyQualifiedId4(thread2) === id);
+          if (index !== -1) {
+            draft.splice(index, 1);
+          }
+        }
+        const thread = doc.threads.find((thread2) => thread2?.id === id);
+        if (thread) {
+          thread.anchor = void 0;
+        }
+      },
+      onUpdate: ({ id, cursor }) => {
+        const thread = state.drafts[fullyQualifiedId4(doc)]?.find((thread2) => fullyQualifiedId4(thread2) === id) ?? doc.threads.find((thread2) => thread2?.id === id);
+        if (thread instanceof ThreadType && thread.anchor) {
+          thread.name = getName(doc, thread.anchor);
+          thread.anchor = cursor;
+        }
+      },
+      onSelect: ({ selection: { current, closest } }) => {
+        void dispatch({
+          action: ThreadAction.SELECT,
+          data: {
+            current: current ?? closest,
+            skipOpen: true
+          }
+        });
+      }
+    })
+  ];
+};
+
 // packages/plugins/plugin-thread/src/translations.ts
 var translations_default = [
   {
@@ -418,7 +504,7 @@ var initialViewState = {
 var ThreadPlugin = () => {
   const settings = new LocalStorageStore(THREAD_PLUGIN);
   const state = create2({
-    staging: {}
+    drafts: {}
   });
   const viewStore = create2({});
   const getViewState = (subjectId) => {
@@ -462,7 +548,7 @@ var ThreadPlugin = () => {
             // TODO(wittjosiah): Move out of metadata.
             loadReferences: (channel) => loadObjectReferences(channel, (channel2) => channel2.threads)
           },
-          [ThreadType.typename]: {
+          [ThreadType2.typename]: {
             // TODO(wittjosiah): Move out of metadata.
             loadReferences: (thread) => loadObjectReferences(thread, (thread2) => thread2.messages)
           },
@@ -498,7 +584,7 @@ var ThreadPlugin = () => {
       echo: {
         schema: [
           ChannelType,
-          ThreadType,
+          ThreadType2,
           MessageType2
         ]
       },
@@ -654,8 +740,7 @@ var ThreadPlugin = () => {
                 settings: settings.values
               }) : null;
             }
-            case "article":
-            case "complementary": {
+            case "article": {
               const location = navigationPlugin?.provides.location;
               if (data.object instanceof ChannelType && data.object.threads[0]) {
                 const channel = data.object;
@@ -664,7 +749,7 @@ var ThreadPlugin = () => {
                   const currentPosition = layoutEntries.findIndex((entry) => channel.id === entry.id);
                   if (currentPosition > 0) {
                     const objectToTheLeft = layoutEntries[currentPosition - 1];
-                    const context = getSpace2(data.object)?.db.getObjectById(objectToTheLeft.id);
+                    const context = getSpace3(data.object)?.db.getObjectById(objectToTheLeft.id);
                     return /* @__PURE__ */ React6.createElement(ThreadArticle, {
                       thread: data.object.threads[0],
                       context
@@ -675,23 +760,27 @@ var ThreadPlugin = () => {
                   thread: data.object.threads[0]
                 });
               }
-              if (data.subject instanceof ThreadType) {
+              if (data.subject instanceof ThreadType2) {
                 return /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(ChatHeading, {
                   attendableId: data.subject.id
                 }), /* @__PURE__ */ React6.createElement(ChatContainer, {
                   thread: data.subject
                 }));
               }
+              break;
+            }
+            case "complementary--comments": {
               if (data.subject && typeof data.subject === "object" && "threads" in data.subject && Array.isArray(data.subject.threads)) {
-                const { showResolvedThreads } = getViewState(fullyQualifiedId4(data.subject));
+                const { showResolvedThreads } = getViewState(fullyQualifiedId5(data.subject));
                 return /* @__PURE__ */ React6.createElement(ThreadComplementary, {
                   role,
                   subject: data.subject,
-                  stagedThreads: state.staging[fullyQualifiedId4(data.subject)],
+                  drafts: state.drafts[fullyQualifiedId5(data.subject)],
                   current: state.current,
                   showResolvedThreads
                 });
               }
+              break;
             }
           }
           return null;
@@ -706,28 +795,28 @@ var ThreadPlugin = () => {
                 if (subject?.threads === void 0) {
                   try {
                     subject.threads = [];
-                  } catch (e) {
+                  } catch (err) {
                     log.error("Subject does not support threads array", subject?.typename, {
                       F: __dxlog_file,
-                      L: 331,
+                      L: 322,
                       S: void 0,
                       C: (f, a) => f(...a)
                     });
                     return;
                   }
                 }
-                const subjectId = fullyQualifiedId4(subject);
-                const thread = create2(ThreadType, {
+                const subjectId = fullyQualifiedId5(subject);
+                const thread = create2(ThreadType2, {
                   name,
                   anchor: cursor,
                   messages: [],
                   status: "staged"
                 });
-                const stagingArea = state.staging[subjectId];
-                if (stagingArea) {
-                  stagingArea.push(thread);
+                const draft = state.drafts[subjectId];
+                if (draft) {
+                  draft.push(thread);
                 } else {
-                  state.staging[subjectId] = [
+                  state.drafts[subjectId] = [
                     thread
                   ];
                 }
@@ -738,15 +827,17 @@ var ThreadPlugin = () => {
                       {
                         action: ThreadAction.SELECT,
                         data: {
-                          current: fullyQualifiedId4(thread)
+                          current: fullyQualifiedId5(thread)
                         }
-                      },
+                      }
+                    ],
+                    [
                       {
-                        action: LayoutAction2.SET_LAYOUT,
+                        action: NavigationAction.OPEN,
                         data: {
-                          element: "complementary",
-                          subject: subjectId,
-                          state: true
+                          activeParts: {
+                            complementary: "comments"
+                          }
                         }
                       }
                     ]
@@ -756,7 +847,7 @@ var ThreadPlugin = () => {
                 return {
                   data: create2(ChannelType, {
                     threads: [
-                      create2(ThreadType, {
+                      create2(ThreadType2, {
                         messages: []
                       })
                     ]
@@ -767,12 +858,24 @@ var ThreadPlugin = () => {
             case ThreadAction.SELECT: {
               state.current = intent.data?.current;
               return {
-                data: true
+                data: true,
+                intents: !intent.data?.skipOpen ? [
+                  [
+                    {
+                      action: NavigationAction.OPEN,
+                      data: {
+                        activeParts: {
+                          complementary: "comments"
+                        }
+                      }
+                    }
+                  ]
+                ] : []
               };
             }
             case ThreadAction.TOGGLE_RESOLVED: {
               const { thread } = intent.data ?? {};
-              if (!(thread instanceof ThreadType)) {
+              if (!(thread instanceof ThreadType2)) {
                 return;
               }
               if (thread.status === "active" || thread.status === void 0) {
@@ -780,9 +883,10 @@ var ThreadPlugin = () => {
               } else if (thread.status === "resolved") {
                 thread.status = "active";
               }
-              const space = getSpace2(thread);
+              const space = getSpace3(thread);
               const spaceId = space?.id;
               return {
+                data: true,
                 intents: [
                   [
                     {
@@ -801,21 +905,21 @@ var ThreadPlugin = () => {
             }
             case ThreadAction.DELETE: {
               const { subject, thread } = intent.data ?? {};
-              if (!(thread instanceof ThreadType) || !(subject && typeof subject === "object" && "threads" in subject)) {
+              if (!(thread instanceof ThreadType2) || !(subject && typeof subject === "object" && "threads" in subject)) {
                 return;
               }
-              const subjectId = fullyQualifiedId4(subject);
-              const stagingArea = state.staging[subjectId];
-              if (stagingArea) {
-                const index = stagingArea.findIndex((t) => t.id === thread.id);
+              const subjectId = fullyQualifiedId5(subject);
+              const draft = state.drafts[subjectId];
+              if (draft) {
+                const index = draft.findIndex((t) => t.id === thread.id);
                 if (index !== -1) {
-                  stagingArea.splice(index, 1);
+                  draft.splice(index, 1);
                   return {
                     data: true
                   };
                 }
               }
-              const space = getSpace2(thread);
+              const space = getSpace3(thread);
               if (!space || !subject.threads) {
                 return;
               }
@@ -873,22 +977,22 @@ var ThreadPlugin = () => {
             }
             case ThreadAction.ON_MESSAGE_ADD: {
               const { thread, subject } = intent.data ?? {};
-              if (!(thread instanceof ThreadType) || !(subject && typeof subject === "object" && "threads" in subject && Array.isArray(subject.threads))) {
+              if (!(thread instanceof ThreadType2) || !(subject && typeof subject === "object" && "threads" in subject && Array.isArray(subject.threads))) {
                 return;
               }
-              const subjectId = fullyQualifiedId4(subject);
-              const space = getSpace2(subject);
+              const subjectId = fullyQualifiedId5(subject);
+              const space = getSpace3(subject);
               const intents = [];
               const analyticsProperties = {
                 threadId: thread.id,
                 spaceId: space?.id
               };
-              if (state.staging[subjectId]?.find((t) => t === thread)) {
+              if (state.drafts[subjectId]?.find((t) => t === thread)) {
                 thread.status = "active";
                 subject.threads ? subject.threads.push(thread) : subject.threads = [
                   thread
                 ];
-                state.staging[subjectId] = state.staging[subjectId]?.filter((t) => t.id !== thread.id);
+                state.drafts[subjectId] = state.drafts[subjectId]?.filter(({ id }) => id !== thread.id);
                 intents.push({
                   action: ObservabilityAction.SEND_EVENT,
                   data: {
@@ -916,8 +1020,8 @@ var ThreadPlugin = () => {
             }
             case ThreadAction.DELETE_MESSAGE: {
               const { subject, thread, messageId } = intent.data ?? {};
-              const space = getSpace2(subject);
-              if (!(thread instanceof ThreadType) || !(subject && typeof subject === "object" && "threads" in subject)) {
+              const space = getSpace3(subject);
+              if (!(thread instanceof ThreadType2) || !(subject && typeof subject === "object" && "threads" in subject)) {
                 return;
               }
               if (!intent.undo) {
@@ -996,92 +1100,8 @@ var ThreadPlugin = () => {
         }
       },
       markdown: {
-        // TODO(burdon): Factor out extension factory into separate file (for simplicity).
         extensions: ({ document: doc }) => {
-          const space = doc && getSpace2(doc);
-          if (!doc || !space) {
-            return [
-              comments()
-            ];
-          }
-          const threads = computed(() => [
-            ...doc.threads.filter(nonNullable3),
-            ...state.staging[fullyQualifiedId4(doc)] ?? []
-          ].filter((thread) => !(thread?.status === "resolved")));
-          return [
-            listener2({
-              onChange: () => {
-                doc.threads.forEach((thread) => {
-                  if (thread?.anchor) {
-                    const [start, end] = thread.anchor.split(":");
-                    const name = doc.content && getTextInRange(createDocAccessor(doc.content, [
-                      "content"
-                    ]), start, end);
-                    if (name && name !== thread.name) {
-                      thread.name = name;
-                    }
-                  }
-                });
-              }
-            }),
-            createExternalCommentSync(fullyQualifiedId4(doc), (sink) => effect(() => sink()), () => threads.value.filter((thread) => thread?.anchor).map((thread) => ({
-              id: fullyQualifiedId4(thread),
-              cursor: thread.anchor
-            }))),
-            comments({
-              id: fullyQualifiedId4(doc),
-              onCreate: ({ cursor }) => {
-                const [start, end] = cursor.split(":");
-                const name = doc.content && getTextInRange(createDocAccessor(doc.content, [
-                  "content"
-                ]), start, end);
-                void intentPlugin?.provides.intent.dispatch({
-                  action: ThreadAction.CREATE,
-                  data: {
-                    cursor,
-                    name,
-                    subject: doc
-                  }
-                });
-              },
-              onDelete: ({ id }) => {
-                const stagingArea = state.staging[fullyQualifiedId4(doc)];
-                if (stagingArea) {
-                  const index = stagingArea.findIndex((thread2) => fullyQualifiedId4(thread2) === id);
-                  if (index !== -1) {
-                    stagingArea.splice(index, 1);
-                  }
-                }
-                const thread = doc.threads.find((thread2) => thread2?.id === id);
-                if (thread) {
-                  thread.anchor = void 0;
-                }
-              },
-              onUpdate: ({ id, cursor }) => {
-                const thread = state.staging[fullyQualifiedId4(doc)]?.find((thread2) => fullyQualifiedId4(thread2) === id) ?? doc.threads.find((thread2) => thread2?.id === id);
-                if (thread instanceof ThreadType && thread.anchor) {
-                  const [start, end] = thread.anchor.split(":");
-                  thread.name = doc.content && getTextInRange(createDocAccessor(doc.content, [
-                    "content"
-                  ]), start, end);
-                  thread.anchor = cursor;
-                }
-              },
-              onSelect: ({ selection: { current, closest } }) => {
-                const dispatch = intentPlugin?.provides.intent.dispatch;
-                if (dispatch) {
-                  void dispatch([
-                    {
-                      action: ThreadAction.SELECT,
-                      data: {
-                        current: current ?? closest
-                      }
-                    }
-                  ]);
-                }
-              }
-            })
-          ];
+          return threads(state, doc, intentPlugin?.provides.intent.dispatch);
         }
       }
     }