@dxos/plugin-thread 0.8.2-main.fbd8ed0 → 0.8.2-staging.7ac8446

package/dist/types/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAMnE,yBAAiB,YAAY,CAAC;;;;;;;;;;;;;;;;;;IAG5B,MAAM,OAAO,aAAc,SAAQ,kBAQjC;KAAG;;;;;;;;;;;;;IAEL,MAAM,OAAO,MAAO,SAAQ,WAS1B;KAAG;;;;;;;;;;;IAEL,MAAM,OAAO,MAAO,SAAQ,WAO1B;KAAG;;;;;;;;;IAEL,MAAM,OAAO,MAAO,SAAQ,WAK1B;KAAG;;;;;;;;;IAEL,MAAM,OAAO,cAAe,SAAQ,mBAKlC;KAAG;;;;;;;;;;0BAZ+E,CAAC;;;yCAOtE,CAAC;;gCAA2E,CAAC;;mCAI1E,CAAC;4BAGQ,CAAC;8BAA4C,CAAC;6BAGnE,CAAC;+BACmB,CAAC;;yBAIvB,CAAC;4BAEiC,CAAC;iCAA+C,CAAC;4BACpE,CAAC;4BAEX,CAAC;8BACW,CAAC;yBACO,CAAC;0BACV,CAAC;;sCAMtB,CAAC;;8BACE,CAAC;;sCAA0E,CAAC;;gCAM/D,CAAC;;sCAET,CAAC;;;oBAGR,gCAAgC;oBAChC,CADF,CAAE,gCAAgC;;2CACI,CAAC;6CAEzB,CAAC;6CAGf,CAAA;2CAAyD,CAAC;+CAA6D,CAAC;wDAAsE,CAAC;4CAA0D,CAAC;;sCAAuE,CAAC;;wBAAmE,CAAC;;sCAA0E,CAAC;;4BAAuE,CAAC;;;;;;;;;;;;IAxCvhB,MAAM,OAAO,UAAW,SAAQ,eAQ9B;KAAG;;;;;;;;;;;;;;8BAgCu5P,CAAC;;;6CAAiI,CAAC;;oCAAmF,CAAC;;uCAA4G,CAAC;gCAA8C,CAAC;kCAAgD,CAAC;iCAAkG,CAAC;mCAAiD,CAAC;;6BAA2E,CAAC;gCAA8C,CAAC;qCAAmD,CAAC;gCAA8C,CAAC;gCAA8C,CAAC;kCAAgD,CAAC;6BAA2C,CAAC;8BAA4C,CAAC;;0CAAkF,CAAC;;kCAAiF,CAAC;;0CAAkF,CAAC;;oCAAmF,CAAC;;0CAAkF,CAAC;;iCAAgF,CAAC;;+CAAiF,CAAC;iDAA+D,CAAC;iDAA+D,CAAC;+CAA6D,CAAC;mDAAiE,CAAC;4DAA0E,CAAC;gDAA8D,CAAC;;0CAA+E,CAAC;;4BAA2E,CAAC;;0CAAkF,CAAC;;gCAA+E,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA9BvnU,MAAM,OAAO,aAAc,SAAQ,kBASjC;KAAG;;CACN;AAED,eAAO,MAAM,oBAAoB,mCAAoC,CAAC;AACtE,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAElF,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,UAAU,CAAC;CAClB;AAED,KAAK,SAAS,GAAG,MAAM,CAAC;AACxB,MAAM,MAAM,SAAS,GAAG;IAAE,mBAAmB,EAAE,OAAO,CAAA;CAAE,CAAC;AACzD,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AAErD,MAAM,MAAM,WAAW,GAAG;IACxB,gCAAgC;IAChC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IAC/C,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;IACrC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,mBAAmB,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEnE,OAAO,EAAe,WAAW,EAAE,MAAM,cAAc,CAAC;AAIxD,yBAAiB,YAAY,CAAC;;;;;;;;;;;;IAG5B,MAAM,OAAO,aAAc,SAAQ,kBASjC;KAAG;;;;;;;;;;;;;IAEL,MAAM,OAAO,MAAO,SAAQ,WAS1B;KAAG;;;;;;;;;IAEL,MAAM,OAAO,MAAO,SAAQ,WAK1B;KAAG;;;;;;;;;IAEL,MAAM,OAAO,cAAe,SAAQ,mBAKlC;KAAG;;;;;;;;;;;IAEL,MAAM,OAAO,MAAO,SAAQ,WAO1B;KAAG;;;;;;;;yBAvCU,EAAG,QAAQ,QACxB,mBACS;;wBAGR,CAAC;;;;;;6BAKM,EAAG,QAAQ,QACjB,EAAG,MAAM;6BAEC,EAAG,QACf,QAAO,EAAG,MAAM;uBAElB,EAAA,QAED,QAAQ,EAAE,MAAM;sBAAa,EAAE,QAAQ,QAAO,EAAG,MAAM;sBAAY,EAAG,QAAQ,CAAE,EAC7E,OAAE;;;;;;IAsBJ,MAAM,OAAO,UAAW,SAAQ,eAQ9B;KAAG;;;;;;;;;;;;;IAEL,MAAM,OAAO,aAAc,SAAQ,kBASjC;KAAG;;CACN;AAED,eAAO,MAAM,oBAAoB,yBAA0B,CAAC;AAE5D,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAE7E,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,UAAU,CAAC;CAClB;AAED,KAAK,SAAS,GAAG,MAAM,CAAC;AACxB,MAAM,MAAM,SAAS,GAAG;IAAE,mBAAmB,EAAE,OAAO,CAAA;CAAE,CAAC;AACzD,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AAErD,MAAM,MAAM,WAAW,GAAG;IACxB,gCAAgC;IAChC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IAC/C,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;IACrC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B,CAAC"}

package/dist/types/src/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,MAAM,MAAM,yBAAyB,GAAG,CAAC,WAAW,EAAE,SAAS,GAAG,SAAS,KAAK,eAAe,CAAC;AAEhG,eAAO,MAAM,kBAAkB,GAAI,IAAI,MAAM,EAAE,WAAW,QAAQ,KAAG,eAapE,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,MAAM,MAAM,yBAAyB,GAAG,CAAC,WAAW,EAAE,SAAS,GAAG,SAAS,KAAK,eAAe,CAAC;AAEhG,eAAO,MAAM,kBAAkB,OAAQ,MAAM,aAAa,QAAQ,KAAG,eAapE,CAAC"}

package/dist/types/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"5.8.3"}
+{"version":"5.7.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-thread",
-  "version": "0.8.2-main.fbd8ed0",
+  "version": "0.8.2-staging.7ac8446",
   "description": "DXOS Threads Surface plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -39,59 +39,52 @@
     "@preact/signals-core": "^1.6.0",
     "date-fns": "^3.3.1",
     "lodash.get": "^4.4.2",
-    "@dxos/app-framework": "0.8.2-main.fbd8ed0",
-    "@dxos/async": "0.8.2-main.fbd8ed0",
-    "@dxos/display-name": "0.8.2-main.fbd8ed0",
-    "@dxos/echo": "0.8.2-main.fbd8ed0",
-    "@dxos/echo-schema": "0.8.2-main.fbd8ed0",
-    "@dxos/invariant": "0.8.2-main.fbd8ed0",
-    "@dxos/local-storage": "0.8.2-main.fbd8ed0",
-    "@dxos/live-object": "0.8.2-main.fbd8ed0",
-    "@dxos/keys": "0.8.2-main.fbd8ed0",
-    "@dxos/log": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-attention": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-client": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-deck": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-markdown": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-graph": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-observability": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-space": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-attention": "0.8.2-main.fbd8ed0",
-    "@dxos/react-client": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-editor": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-form": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-menu": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-stack": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-tabs": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-thread": "0.8.2-main.fbd8ed0",
-    "@dxos/schema": "0.8.2-main.fbd8ed0",
-    "@dxos/util": "0.8.2-main.fbd8ed0"
+    "@dxos/app-framework": "0.8.2-staging.7ac8446",
+    "@dxos/display-name": "0.8.2-staging.7ac8446",
+    "@dxos/echo-schema": "0.8.2-staging.7ac8446",
+    "@dxos/async": "0.8.2-staging.7ac8446",
+    "@dxos/invariant": "0.8.2-staging.7ac8446",
+    "@dxos/keys": "0.8.2-staging.7ac8446",
+    "@dxos/live-object": "0.8.2-staging.7ac8446",
+    "@dxos/local-storage": "0.8.2-staging.7ac8446",
+    "@dxos/log": "0.8.2-staging.7ac8446",
+    "@dxos/plugin-attention": "0.8.2-staging.7ac8446",
+    "@dxos/plugin-deck": "0.8.2-staging.7ac8446",
+    "@dxos/plugin-markdown": "0.8.2-staging.7ac8446",
+    "@dxos/plugin-client": "0.8.2-staging.7ac8446",
+    "@dxos/plugin-observability": "0.8.2-staging.7ac8446",
+    "@dxos/plugin-graph": "0.8.2-staging.7ac8446",
+    "@dxos/plugin-space": "0.8.2-staging.7ac8446",
+    "@dxos/react-client": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-attention": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-editor": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-form": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-menu": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-stack": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-thread": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-tabs": "0.8.2-staging.7ac8446",
+    "@dxos/schema": "0.8.2-staging.7ac8446",
+    "@dxos/util": "0.8.2-staging.7ac8446"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "0.80.12",
     "@phosphor-icons/react": "^2.1.5",
     "@types/lodash.get": "^4.4.7",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
-    "effect": "3.14.21",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/random": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui": "0.8.2-main.fbd8ed0",
-    "@dxos/storybook-utils": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-theme": "0.8.2-main.fbd8ed0"
+    "@dxos/react-ui": "0.8.2-staging.7ac8446",
+    "@dxos/random": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-theme": "0.8.2-staging.7ac8446",
+    "@dxos/storybook-utils": "0.8.2-staging.7ac8446"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "0.80.12",
     "@phosphor-icons/react": "^2.1.5",
-    "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-theme": "0.8.2-main.fbd8ed0"
+    "@dxos/react-ui": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-theme": "0.8.2-staging.7ac8446"
   },
   "publishConfig": {
     "access": "public"

package/src/ThreadPlugin.tsx

@@ -7,9 +7,9 @@ import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
 import { MarkdownEvents } from '@dxos/plugin-markdown';
 import { SpaceCapabilities, ThreadEvents } from '@dxos/plugin-space';
 import { ChannelType, defineObjectForm, ThreadType } from '@dxos/plugin-space/types';
-import { type AnyLiveObject, RefArray } from '@dxos/react-client/echo';
+import { type ReactiveEchoObject, RefArray } from '@dxos/react-client/echo';
 import { translations as threadTranslations } from '@dxos/react-ui-thread';
-import { DataType } from '@dxos/schema';
+import { MessageType, MessageTypeV1, MessageTypeV1ToV2 } from '@dxos/schema';
 
 import { AppGraphBuilder, IntentResolver, Markdown, ReactSurface, ThreadState } from './capabilities';
 import { ThreadEvents as LocalThreadEvents } from './events';
@@ -58,16 +58,16 @@ export const ThreadPlugin = () =>
           },
         }),
         contributes(Capabilities.Metadata, {
-          id: DataType.Message.typename,
+          id: MessageType.typename,
           metadata: {
             // TODO(wittjosiah): Move out of metadata.
-            loadReferences: (message: DataType.Message) => [], // loadObjectReferences(message, (message) => [...message.parts, message.context]),
+            loadReferences: (message: MessageType) => [], // loadObjectReferences(message, (message) => [...message.parts, message.context]),
           },
         }),
         contributes(Capabilities.Metadata, {
           id: THREAD_ITEM,
           metadata: {
-            parse: (item: AnyLiveObject<any>, type: string) => {
+            parse: (item: ReactiveEchoObject<any>, type: string) => {
               switch (type) {
                 case 'node':
                   return { id: item.id, label: item.title, data: item };
@@ -96,12 +96,12 @@ export const ThreadPlugin = () =>
     defineModule({
       id: `${meta.id}/module/schema`,
       activatesOn: ClientEvents.SetupSchema,
-      activate: () => contributes(ClientCapabilities.Schema, [ThreadType, DataType.Message, DataType.MessageV1]),
+      activate: () => contributes(ClientCapabilities.Schema, [ThreadType, MessageType, MessageTypeV1]),
     }),
     defineModule({
       id: `${meta.id}/module/migration`,
       activatesOn: ClientEvents.SetupMigration,
-      activate: () => contributes(ClientCapabilities.Migration, [DataType.MessageV1ToV2]),
+      activate: () => contributes(ClientCapabilities.Migration, [MessageTypeV1ToV2]),
     }),
     defineModule({
       id: `${meta.id}/module/markdown`,

package/src/capabilities/app-graph-builder.ts

@@ -2,43 +2,33 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Rx } from '@effect-rx/rx-react';
-import { Option, pipe } from 'effect';
-
-import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
+import { Capabilities, contributes, type PluginsContext } from '@dxos/app-framework';
+import { type ReactiveEchoObject } from '@dxos/client/echo';
 import { PLANK_COMPANION_TYPE, ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
-import { createExtension } from '@dxos/plugin-graph';
-import { isLiveObject } from '@dxos/react-client/echo';
+import { createExtension, type Node } from '@dxos/plugin-graph';
 
 import { meta } from '../meta';
 
-export default (context: PluginContext) =>
+export default (context: PluginsContext) =>
   contributes(Capabilities.AppGraphBuilder, [
     createExtension({
       id: `${meta.id}/comments`,
-      connector: (node) =>
-        Rx.make((get) =>
-          pipe(
-            get(node),
-            Option.flatMap((node) =>
-              // TODO(wittjosiah): Support comments on any object.
-              isLiveObject(node.data) && Array.isArray(node.data.threads) ? Option.some(node) : Option.none(),
-            ),
-            Option.map((node) => [
-              {
-                id: [node.id, 'comments'].join(ATTENDABLE_PATH_SEPARATOR),
-                type: PLANK_COMPANION_TYPE,
-                data: 'comments',
-                properties: {
-                  label: ['comments label', { ns: meta.id }],
-                  icon: 'ph--chat-text--regular',
-                  disposition: 'hidden',
-                  position: 'hoist',
-                },
-              },
-            ]),
-            Option.getOrElse(() => []),
-          ),
-        ),
+      // TODO(wittjosiah): Support comments on any object.
+      // filter: (node): node is Node<ReactiveEchoObject<any>> => isEchoObject(node.data),
+      filter: (node): node is Node<ReactiveEchoObject<any>> =>
+        !!node.data && typeof node.data === 'object' && 'threads' in node.data && Array.isArray(node.data.threads),
+      connector: ({ node }) => [
+        {
+          id: [node.id, 'comments'].join(ATTENDABLE_PATH_SEPARATOR),
+          type: PLANK_COMPANION_TYPE,
+          data: 'comments',
+          properties: {
+            label: ['comments label', { ns: meta.id }],
+            icon: 'ph--chat-text--regular',
+            disposition: 'hidden',
+            position: 'hoist',
+          },
+        },
+      ],
     }),
   ]);

package/src/capabilities/intent-resolver.ts

@@ -2,30 +2,31 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes, createIntent, createResolver, type PluginContext } from '@dxos/app-framework';
-import { createQueueDxn, Ref } from '@dxos/echo-schema';
+import { Capabilities, contributes, createIntent, createResolver, type PluginsContext } from '@dxos/app-framework';
+import { ObjectId, Ref } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
+import { DXN, QueueSubspaceTags } from '@dxos/keys';
 import { refFromDXN } from '@dxos/live-object';
 import { log } from '@dxos/log';
 import { ATTENDABLE_PATH_SEPARATOR, DeckAction } from '@dxos/plugin-deck/types';
 import { ObservabilityAction } from '@dxos/plugin-observability/types';
 import { ChannelType, ThreadType } from '@dxos/plugin-space/types';
-import { live, fullyQualifiedId, getSpace, makeRef } from '@dxos/react-client/echo';
-import { DataType } from '@dxos/schema';
+import { create, fullyQualifiedId, getSpace, makeRef } from '@dxos/react-client/echo';
+import { MessageType } from '@dxos/schema';
 
 import { ThreadCapabilities } from './capabilities';
 import { THREAD_PLUGIN } from '../meta';
 import { ThreadAction } from '../types';
 
-export default (context: PluginContext) =>
+export default (context: PluginsContext) =>
   contributes(Capabilities.IntentResolver, [
     createResolver({
       intent: ThreadAction.CreateChannel,
       resolve: ({ spaceId, name }) => ({
         data: {
-          object: live(ChannelType, {
+          object: create(ChannelType, {
             name,
-            queue: refFromDXN(createQueueDxn(spaceId)),
+            queue: refFromDXN(new DXN(DXN.kind.QUEUE, [QueueSubspaceTags.DATA, spaceId, ObjectId.random()])),
           }),
         },
       }),
@@ -44,9 +45,9 @@ export default (context: PluginContext) =>
           }
         }
 
-        const { state } = context.getCapability(ThreadCapabilities.MutableState);
+        const { state } = context.requestCapability(ThreadCapabilities.MutableState);
         const subjectId = fullyQualifiedId(subject);
-        const thread = live(ThreadType, { name, anchor: cursor, messages: [], status: 'staged' });
+        const thread = create(ThreadType, { name, anchor: cursor, messages: [], status: 'staged' });
         const draft = state.drafts[subjectId];
         if (draft) {
           draft.push(thread);
@@ -69,7 +70,7 @@ export default (context: PluginContext) =>
     createResolver({
       intent: ThreadAction.Select,
       resolve: ({ current }) => {
-        const { state } = context.getCapability(ThreadCapabilities.MutableState);
+        const { state } = context.requestCapability(ThreadCapabilities.MutableState);
         state.current = current;
       },
     }),
@@ -102,7 +103,7 @@ export default (context: PluginContext) =>
     createResolver({
       intent: ThreadAction.Delete,
       resolve: ({ subject, thread }, undo) => {
-        const { state } = context.getCapability(ThreadCapabilities.MutableState);
+        const { state } = context.requestCapability(ThreadCapabilities.MutableState);
         const subjectId = fullyQualifiedId(subject);
         const draft = state.drafts[subjectId];
         if (draft) {
@@ -165,13 +166,13 @@ export default (context: PluginContext) =>
     createResolver({
       intent: ThreadAction.AddMessage,
       resolve: ({ thread, subject, sender, text }) => {
-        const { state } = context.getCapability(ThreadCapabilities.MutableState);
+        const { state } = context.requestCapability(ThreadCapabilities.MutableState);
         const subjectId = fullyQualifiedId(subject);
         const space = getSpace(subject);
         invariant(space, 'Space not found');
         const intents = [];
 
-        const message = live(DataType.Message, {
+        const message = create(MessageType, {
           sender,
           created: new Date().toISOString(),
           blocks: [{ type: 'text', text }],

package/src/capabilities/markdown.ts

@@ -2,17 +2,17 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
+import { Capabilities, contributes, type PluginsContext } from '@dxos/app-framework';
 import { MarkdownCapabilities } from '@dxos/plugin-markdown';
 
 import { ThreadCapabilities } from './capabilities';
 import { threads } from '../extensions';
 
-export default (context: PluginContext) =>
+export default (context: PluginsContext) =>
   contributes(MarkdownCapabilities.Extensions, [
     ({ document: doc }) => {
-      const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-      const { state } = context.getCapability(ThreadCapabilities.MutableState);
+      const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
+      const { state } = context.requestCapability(ThreadCapabilities.MutableState);
       return threads(state, doc, dispatch);
     },
   ]);

package/src/capabilities/settings.ts

@@ -3,12 +3,12 @@
 //
 
 import { Capabilities, contributes } from '@dxos/app-framework';
-import { live } from '@dxos/live-object';
+import { create } from '@dxos/live-object';
 
 import { THREAD_PLUGIN } from '../meta';
 import { type ThreadSettingsProps, ThreadSettingsSchema } from '../types';
 
 export default () => {
-  const settings = live<ThreadSettingsProps>({});
+  const settings = create<ThreadSettingsProps>({});
   return contributes(Capabilities.Settings, { schema: ThreadSettingsSchema, prefix: THREAD_PLUGIN, value: settings });
 };

package/src/capabilities/state.ts

@@ -3,7 +3,7 @@
 //
 
 import { contributes } from '@dxos/app-framework';
-import { live } from '@dxos/live-object';
+import { create } from '@dxos/live-object';
 
 import { ThreadCapabilities } from './capabilities';
 import { type ThreadState, type ViewStore } from '../types';
@@ -11,8 +11,8 @@ import { type ThreadState, type ViewStore } from '../types';
 const initialViewState = { showResolvedThreads: false };
 
 export default () => {
-  const state = live<ThreadState>({ activities: {}, drafts: {} });
-  const viewStore = live<ViewStore>({});
+  const state = create<ThreadState>({ activities: {}, drafts: {} });
+  const viewStore = create<ViewStore>({});
 
   const getViewState = (subjectId: string) => {
     if (!viewStore[subjectId]) {

package/src/components/Chat.stories.tsx

@@ -9,16 +9,17 @@ import React, { useEffect, useState } from 'react';
 
 import { Capabilities, contributes, createSurface, IntentPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { createQueueDxn } from '@dxos/echo-schema';
+import { ObjectId } from '@dxos/echo-schema';
+import { DXN, QueueSubspaceTags } from '@dxos/keys';
 import { refFromDXN } from '@dxos/live-object';
 import { ChannelType, ThreadType } from '@dxos/plugin-space/types';
 import { faker } from '@dxos/random';
 import { useClient } from '@dxos/react-client';
-import { live, type Space } from '@dxos/react-client/echo';
+import { create, type Space } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Thread } from '@dxos/react-ui-thread';
-import { DataType } from '@dxos/schema';
+import { MessageType } from '@dxos/schema';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { ChatContainer } from './ChatContainer';
@@ -37,8 +38,8 @@ const Story = () => {
       setTimeout(async () => {
         const space = await client.spaces.create();
         const channel = space.db.add(
-          live(ChannelType, {
-            queue: refFromDXN(createQueueDxn(space.id)),
+          create(ChannelType, {
+            queue: refFromDXN(new DXN(DXN.kind.QUEUE, [QueueSubspaceTags.DATA, space.id, ObjectId.random()])),
           }),
         );
         setSpace(space);
@@ -79,8 +80,8 @@ const meta: Meta = {
       ],
     }),
     withTheme,
-    withLayout({ fullscreen: true }),
-    withClientProvider({ createSpace: true, types: [ThreadType, DataType.Message] }),
+    withLayout({ fullscreen: true, tooltips: true }),
+    withClientProvider({ createSpace: true, types: [ThreadType, MessageType] }),
   ],
   parameters: { translations },
 };

package/src/components/ChatContainer.tsx

@@ -4,7 +4,7 @@
 
 import React, { useLayoutEffect, useMemo, useRef, useState } from 'react';
 
-import { create } from '@dxos/echo-schema';
+import { createStatic } from '@dxos/echo-schema';
 import { type DXN } from '@dxos/keys';
 import { makeRef } from '@dxos/live-object';
 import { type Space, useMembers, useQueue } from '@dxos/react-client/echo';
@@ -14,7 +14,7 @@ import { createBasicExtensions, createThemeExtensions, listener } from '@dxos/re
 import { StackItem } from '@dxos/react-ui-stack';
 import { mx } from '@dxos/react-ui-theme';
 import { MessageTextbox, type MessageTextboxProps, Thread, ThreadFooter, threadLayout } from '@dxos/react-ui-thread';
-import { DataType } from '@dxos/schema';
+import { MessageType } from '@dxos/schema';
 
 import { MessageContainer } from './MessageContainer';
 import { command } from './command-extension';
@@ -44,7 +44,7 @@ export const ChatContainer = ({ space, dxn, context, current, autoFocusTextbox }
   const id = dxn.toString();
   const identity = useIdentity()!;
   const members = useMembers(space?.key);
-  const queue = useQueue<DataType.Message>(dxn, { pollInterval: 1_000 });
+  const queue = useQueue<MessageType>(dxn, { pollInterval: 1_000 });
   const activity = useStatus(space, id);
   const { t } = useTranslation(THREAD_PLUGIN);
   // TODO(wittjosiah): This is a hack to reset the editor after a message is sent.
@@ -84,7 +84,7 @@ export const ChatContainer = ({ space, dxn, context, current, autoFocusTextbox }
     }
 
     queue.append([
-      create(DataType.Message, {
+      createStatic(MessageType, {
         sender: { identityDid: identity.did },
         created: new Date().toISOString(),
         blocks: [{ type: 'text', text: messageRef.current }],

package/src/components/CommentContainer.tsx

@@ -42,17 +42,25 @@ const ToggleResolvedButton = ({
   const { t } = useTranslation(THREAD_PLUGIN);
   const label = t(isResolved ? 'mark as unresolved label' : 'mark as resolved label');
   return (
-    <Tooltip.Trigger asChild content={label}>
-      <Button
-        variant='ghost'
-        data-testid='thread.toggle-resolved'
-        onClick={onResolve}
-        classNames={[commentControlClassNames, !isResolved && hoverableControlItem]}
-      >
-        <span className='sr-only'>{label}</span>
-        {isResolved ? <CheckCircle className={sizeClass} weight='fill' /> : <CheckCircle className={sizeClass} />}
-      </Button>
-    </Tooltip.Trigger>
+    <Tooltip.Root>
+      <Tooltip.Trigger asChild>
+        <Button
+          variant='ghost'
+          data-testid='thread.toggle-resolved'
+          onClick={onResolve}
+          classNames={[commentControlClassNames, !isResolved && hoverableControlItem]}
+        >
+          <span className='sr-only'>{label}</span>
+          {isResolved ? <CheckCircle className={sizeClass} weight='fill' /> : <CheckCircle className={sizeClass} />}
+        </Button>
+      </Tooltip.Trigger>
+      <Tooltip.Portal>
+        <Tooltip.Content>
+          {label}
+          <Tooltip.Arrow />
+        </Tooltip.Content>
+      </Tooltip.Portal>
+    </Tooltip.Root>
   );
 };
 
@@ -60,17 +68,25 @@ const DeleteThreadButton = ({ onDelete }: { onDelete: () => void }) => {
   const { t } = useTranslation(THREAD_PLUGIN);
   const label = t('delete thread label');
   return (
-    <Tooltip.Trigger asChild content={label}>
-      <Button
-        variant='ghost'
-        data-testid='thread.delete'
-        onClick={onDelete}
-        classNames={[commentControlClassNames, hoverableControlItem]}
-      >
-        <span className='sr-only'>{label}</span>
-        <X className={sizeClass} />
-      </Button>
-    </Tooltip.Trigger>
+    <Tooltip.Root>
+      <Tooltip.Trigger asChild>
+        <Button
+          variant='ghost'
+          data-testid='thread.delete'
+          onClick={onDelete}
+          classNames={[commentControlClassNames, hoverableControlItem]}
+        >
+          <span className='sr-only'>{label}</span>
+          <X className={sizeClass} />
+        </Button>
+      </Tooltip.Trigger>
+      <Tooltip.Portal>
+        <Tooltip.Content classNames='z-30'>
+          {label}
+          <Tooltip.Arrow />
+        </Tooltip.Content>
+      </Tooltip.Portal>
+    </Tooltip.Root>
   );
 };
 
@@ -140,9 +156,17 @@ export const CommentContainer = ({
         )}
       >
         {detached ? (
-          <Tooltip.Trigger asChild content={t('detached thread label')} side='top'>
-            <ThreadHeading detached>{thread.name}</ThreadHeading>
-          </Tooltip.Trigger>
+          <Tooltip.Root>
+            <Tooltip.Trigger asChild>
+              <ThreadHeading detached>{thread.name}</ThreadHeading>
+            </Tooltip.Trigger>
+            <Tooltip.Portal>
+              <Tooltip.Content classNames='z-30' side='top'>
+                {t('detached thread label')}
+                <Tooltip.Arrow />
+              </Tooltip.Content>
+            </Tooltip.Portal>
+          </Tooltip.Root>
         ) : (
           <ThreadHeading>{thread.name}</ThreadHeading>
         )}

package/src/components/Comments.stories.tsx

@@ -14,7 +14,7 @@ import { faker } from '@dxos/random';
 import { Filter, fullyQualifiedId, useQuery, useSpace } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { type ClientRepeatedComponentProps, ClientRepeater } from '@dxos/react-client/testing';
-import { DataType } from '@dxos/schema';
+import { MessageType } from '@dxos/schema';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { CommentsContainer } from './CommentsContainer';
@@ -26,7 +26,7 @@ faker.seed(1);
 const Story = ({ spaceKey }: ClientRepeatedComponentProps) => {
   const identity = useIdentity();
   const space = useSpace(spaceKey);
-  const threads = useQuery(space, Filter.type(ThreadType));
+  const threads = useQuery(space, Filter.schema(ThreadType));
   const [detached, setDetached] = useState<string[]>([]);
 
   useEffect(() => {
@@ -54,20 +54,18 @@ const Story = ({ spaceKey }: ClientRepeatedComponentProps) => {
   );
 };
 
+export const Default = {};
+
 const meta: Meta = {
   title: 'plugins/plugin-thread/Comments',
   // TODO(wittjosiah): Use decorator.
-  render: () => <ClientRepeater component={Story} createIdentity createSpace types={[ThreadType, DataType.Message]} />,
+  render: () => <ClientRepeater component={Story} createIdentity createSpace types={[ThreadType, MessageType]} />,
   decorators: [
     withTheme,
-    withLayout({ fullscreen: true }),
-    withPluginManager({
-      plugins: [IntentPlugin()],
-    }),
+    withLayout({ fullscreen: true, tooltips: true }),
+    withPluginManager({ plugins: [IntentPlugin()] }),
   ],
   parameters: { translations },
 };
 
 export default meta;
-
-export const Default = {};

package/src/components/CommentsContainer.tsx

@@ -8,7 +8,7 @@ import React, { useEffect } from 'react';
 import { type ThreadType } from '@dxos/plugin-space/types';
 import { fullyQualifiedId } from '@dxos/react-client/echo';
 import { useTranslation, Trans } from '@dxos/react-ui';
-import { descriptionMessage, mx } from '@dxos/react-ui-theme';
+import { descriptionText, mx } from '@dxos/react-ui-theme';
 
 import { CommentContainer } from './CommentContainer';
 import { type ThreadContainerProps } from './types';
@@ -59,7 +59,13 @@ export const CommentsContainer = ({
           );
         })
       ) : (
-        <div role='alert' className={mx(descriptionMessage, 'place-self-center rounded-lg text-center m-4')}>
+        <div
+          role='alert'
+          className={mx(
+            descriptionText,
+            'place-self-center border border-dashed border-unAccent rounded-lg text-center p-4 m-4',
+          )}
+        >
           <h2 className='mbe-2 font-medium text-baseText'>{t('no comments title')}</h2>
           <p>
             <Trans