@dxos/plugin-thread 0.8.1-staging.5be625a → 0.8.1-staging.97aedb1

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

@@ -26,7 +26,7 @@ declare const _default: {
             'edit message label'?: undefined;
             'delete message label'?: undefined;
             'open comments panel label'?: undefined;
-            'comments panel label'?: undefined;
+            'comments label'?: undefined;
             'show all label'?: undefined;
             'show unresolved label'?: undefined;
         } | {
@@ -53,7 +53,7 @@ declare const _default: {
             'edit message label': string;
             'delete message label': string;
             'open comments panel label': string;
-            'comments panel label': string;
+            'comments label': string;
             'show all label': string;
             'show unresolved label': string;
             'typename label'?: undefined;
@@ -83,7 +83,7 @@ declare const _default: {
             'edit message label': string;
             'delete message label': string;
             'open comments panel label': string;
-            'comments panel label': string;
+            'comments label': string;
             'show all label': string;
             'show unresolved label': string;
         };

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

@@ -34,7 +34,6 @@ export declare namespace ThreadAction {
     } & {
         input: S.Struct<{
             current: typeof S.String;
-            skipOpen: S.optional<typeof S.Boolean>;
         }>;
         output: typeof S.Void;
     }>;
@@ -62,16 +61,32 @@ export declare namespace ThreadAction {
     }>;
     export class Delete extends Delete_base {
     }
-    const OnMessageAdd_base: S.TaggedClass<OnMessageAdd, "dxos.org/plugin/thread/action/on-message-add", {
-        readonly _tag: S.tag<"dxos.org/plugin/thread/action/on-message-add">;
+    const AddMessage_base: S.TaggedClass<AddMessage, "dxos.org/plugin/thread/action/add-message", {
+        readonly _tag: S.tag<"dxos.org/plugin/thread/action/add-message">;
     } & {
         input: S.Struct<{
-            thread: typeof ThreadType;
             subject: S.Schema<import("@dxos/echo-db").ReactiveEchoObject<any>, import("@dxos/echo-db").ReactiveEchoObject<any>, never>;
+            thread: typeof ThreadType;
+            sender: S.Struct<{
+                contact: S.optional<import("@dxos/echo-schema").Ref$<{
+                    readonly id: string;
+                    name?: string | undefined;
+                    identifiers: {
+                        readonly value: string;
+                        readonly type: string;
+                    }[];
+                }>>;
+                identityDid: S.optional<typeof S.String>;
+                identityKey: S.optional<typeof S.String>;
+                email: S.optional<typeof S.String>;
+                name: S.optional<typeof S.String>;
+                role: S.optional<S.Literal<["user", "assistant"]>>;
+            }>;
+            text: typeof S.String;
         }>;
         output: typeof S.Void;
     }>;
-    export class OnMessageAdd extends OnMessageAdd_base {
+    export class AddMessage extends AddMessage_base {
     }
     const DeleteMessage_base: S.TaggedClass<DeleteMessage, "dxos.org/plugin/thread/action/delete-message", {
         readonly _tag: S.tag<"dxos.org/plugin/thread/action/delete-message">;

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,CAAC,EAAE,MAAM,mBAAmB,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAI3C,yBAAiB,YAAY,CAAC;;;;;;;;;;;;IAG5B,MAAM,OAAO,aAAc,SAAQ,kBASjC;KAAG;;;;;;;;;;;;;IAEL,MAAM,OAAO,MAAO,SAAQ,WAS1B;KAAG;;;;;;;;;;IAEL,MAAM,OAAO,MAAO,SAAQ,WAM1B;KAAG;;;;;;;;;IAEL,MAAM,OAAO,cAAe,SAAQ,mBAKlC;KAAG;;;;;;;;;;;IAEL,MAAM,OAAO,MAAO,SAAQ,WAO1B;KAAG;;;;;;;;;;IAGL,MAAM,OAAO,YAAa,SAAQ,iBAMhC;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"}
+{"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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-thread",
-  "version": "0.8.1-staging.5be625a",
+  "version": "0.8.1-staging.97aedb1",
   "description": "DXOS Threads Surface plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -39,32 +39,32 @@
     "@preact/signals-core": "^1.6.0",
     "date-fns": "^3.3.1",
     "lodash.get": "^4.4.2",
-    "@dxos/app-framework": "0.8.1-staging.5be625a",
-    "@dxos/display-name": "0.8.1-staging.5be625a",
-    "@dxos/async": "0.8.1-staging.5be625a",
-    "@dxos/invariant": "0.8.1-staging.5be625a",
-    "@dxos/keys": "0.8.1-staging.5be625a",
-    "@dxos/echo-schema": "0.8.1-staging.5be625a",
-    "@dxos/live-object": "0.8.1-staging.5be625a",
-    "@dxos/local-storage": "0.8.1-staging.5be625a",
-    "@dxos/plugin-attention": "0.8.1-staging.5be625a",
-    "@dxos/log": "0.8.1-staging.5be625a",
-    "@dxos/plugin-client": "0.8.1-staging.5be625a",
-    "@dxos/plugin-deck": "0.8.1-staging.5be625a",
-    "@dxos/plugin-graph": "0.8.1-staging.5be625a",
-    "@dxos/plugin-markdown": "0.8.1-staging.5be625a",
-    "@dxos/plugin-observability": "0.8.1-staging.5be625a",
-    "@dxos/plugin-space": "0.8.1-staging.5be625a",
-    "@dxos/react-client": "0.8.1-staging.5be625a",
-    "@dxos/react-ui-attention": "0.8.1-staging.5be625a",
-    "@dxos/react-ui-form": "0.8.1-staging.5be625a",
-    "@dxos/react-ui-menu": "0.8.1-staging.5be625a",
-    "@dxos/react-ui-editor": "0.8.1-staging.5be625a",
-    "@dxos/react-ui-stack": "0.8.1-staging.5be625a",
-    "@dxos/react-ui-tabs": "0.8.1-staging.5be625a",
-    "@dxos/react-ui-thread": "0.8.1-staging.5be625a",
-    "@dxos/schema": "0.8.1-staging.5be625a",
-    "@dxos/util": "0.8.1-staging.5be625a"
+    "@dxos/app-framework": "0.8.1-staging.97aedb1",
+    "@dxos/async": "0.8.1-staging.97aedb1",
+    "@dxos/display-name": "0.8.1-staging.97aedb1",
+    "@dxos/echo-schema": "0.8.1-staging.97aedb1",
+    "@dxos/invariant": "0.8.1-staging.97aedb1",
+    "@dxos/keys": "0.8.1-staging.97aedb1",
+    "@dxos/live-object": "0.8.1-staging.97aedb1",
+    "@dxos/log": "0.8.1-staging.97aedb1",
+    "@dxos/plugin-attention": "0.8.1-staging.97aedb1",
+    "@dxos/plugin-client": "0.8.1-staging.97aedb1",
+    "@dxos/plugin-deck": "0.8.1-staging.97aedb1",
+    "@dxos/plugin-graph": "0.8.1-staging.97aedb1",
+    "@dxos/plugin-markdown": "0.8.1-staging.97aedb1",
+    "@dxos/plugin-observability": "0.8.1-staging.97aedb1",
+    "@dxos/local-storage": "0.8.1-staging.97aedb1",
+    "@dxos/plugin-space": "0.8.1-staging.97aedb1",
+    "@dxos/react-client": "0.8.1-staging.97aedb1",
+    "@dxos/react-ui-attention": "0.8.1-staging.97aedb1",
+    "@dxos/react-ui-menu": "0.8.1-staging.97aedb1",
+    "@dxos/react-ui-form": "0.8.1-staging.97aedb1",
+    "@dxos/react-ui-stack": "0.8.1-staging.97aedb1",
+    "@dxos/react-ui-tabs": "0.8.1-staging.97aedb1",
+    "@dxos/react-ui-editor": "0.8.1-staging.97aedb1",
+    "@dxos/schema": "0.8.1-staging.97aedb1",
+    "@dxos/util": "0.8.1-staging.97aedb1",
+    "@dxos/react-ui-thread": "0.8.1-staging.97aedb1"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -74,17 +74,17 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/react-ui": "0.8.1-staging.5be625a",
-    "@dxos/random": "0.8.1-staging.5be625a",
-    "@dxos/storybook-utils": "0.8.1-staging.5be625a",
-    "@dxos/react-ui-theme": "0.8.1-staging.5be625a"
+    "@dxos/random": "0.8.1-staging.97aedb1",
+    "@dxos/react-ui": "0.8.1-staging.97aedb1",
+    "@dxos/storybook-utils": "0.8.1-staging.97aedb1",
+    "@dxos/react-ui-theme": "0.8.1-staging.97aedb1"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.1-staging.5be625a",
-    "@dxos/react-ui-theme": "0.8.1-staging.5be625a"
+    "@dxos/react-ui": "0.8.1-staging.97aedb1",
+    "@dxos/react-ui-theme": "0.8.1-staging.97aedb1"
   },
   "publishConfig": {
     "access": "public"

package/src/ThreadPlugin.tsx

@@ -4,7 +4,6 @@
 
 import { Capabilities, contributes, createIntent, defineModule, definePlugin, Events } from '@dxos/app-framework';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
-import { DeckCapabilities, DeckEvents } from '@dxos/plugin-deck';
 import { MarkdownEvents } from '@dxos/plugin-markdown';
 import { SpaceCapabilities, ThreadEvents } from '@dxos/plugin-space';
 import { ChannelType, defineObjectForm, ThreadType } from '@dxos/plugin-space/types';
@@ -12,9 +11,9 @@ import { type ReactiveEchoObject, RefArray } from '@dxos/react-client/echo';
 import { translations as threadTranslations } from '@dxos/react-ui-thread';
 import { MessageType, MessageTypeV1, MessageTypeV1ToV2 } from '@dxos/schema';
 
-import { IntentResolver, Markdown, ReactSurface, ThreadState } from './capabilities';
+import { AppGraphBuilder, IntentResolver, Markdown, ReactSurface, ThreadState } from './capabilities';
 import { ThreadEvents as LocalThreadEvents } from './events';
-import { meta, THREAD_ITEM, THREAD_PLUGIN } from './meta';
+import { meta, THREAD_ITEM } from './meta';
 import translations from './translations';
 import { ThreadAction } from './types';
 
@@ -48,7 +47,7 @@ export const ThreadPlugin = () =>
         contributes(Capabilities.Metadata, {
           id: ChannelType.typename,
           metadata: {
-            icon: 'ph--chat--regular',
+            icon: 'ph--hash--regular',
           },
         }),
         contributes(Capabilities.Metadata, {
@@ -104,25 +103,6 @@ export const ThreadPlugin = () =>
       activatesOn: ClientEvents.SetupMigration,
       activate: () => contributes(ClientCapabilities.Migration, [MessageTypeV1ToV2]),
     }),
-    defineModule({
-      id: `${meta.id}/module/complementary-panel`,
-      activatesOn: DeckEvents.SetupComplementaryPanels,
-      activate: () =>
-        contributes(DeckCapabilities.ComplementaryPanel, {
-          id: 'comments',
-          label: ['comments panel label', { ns: THREAD_PLUGIN }],
-          icon: 'ph--chat-text--regular',
-          position: 'hoist',
-          // TODO(wittjosiah): Support comments on any object.
-          // filter: (node) => isEchoObject(node.data) && !!getSpace(node.data),
-          filter: (node) =>
-            !!node.data &&
-            typeof node.data === 'object' &&
-            'threads' in node.data &&
-            Array.isArray(node.data.threads) &&
-            !(node.data instanceof ChannelType),
-        }),
-    }),
     defineModule({
       id: `${meta.id}/module/markdown`,
       activatesOn: MarkdownEvents.SetupExtensions,
@@ -140,4 +120,9 @@ export const ThreadPlugin = () =>
       activatesOn: Events.SetupIntentResolver,
       activate: IntentResolver,
     }),
+    defineModule({
+      id: `${meta.id}/module/app-graph-builder`,
+      activatesOn: Events.SetupAppGraph,
+      activate: AppGraphBuilder,
+    }),
   ]);

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

@@ -0,0 +1,34 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+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, type Node } from '@dxos/plugin-graph';
+
+import { meta } from '../meta';
+
+export default (context: PluginsContext) =>
+  contributes(Capabilities.AppGraphBuilder, [
+    createExtension({
+      id: `${meta.id}/comments`,
+      // 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/capabilities.ts

@@ -3,7 +3,6 @@
 //
 
 import { defineCapability } from '@dxos/app-framework';
-import { type MenuActionProperties } from '@dxos/react-ui-menu';
 import { type DeepReadonly } from '@dxos/util';
 
 import { THREAD_PLUGIN } from '../meta';
@@ -17,9 +16,4 @@ export namespace ThreadCapabilities {
   export const MutableState = defineCapability<{ state: ThreadState; getViewState: GetViewState }>(
     `${THREAD_PLUGIN}/capability/state`,
   );
-
-  export type Activity = Omit<MenuActionProperties, 'variant' | 'checked'> & {
-    id: string;
-  };
-  export const Activity = defineCapability<Activity>(`${THREAD_PLUGIN}/capability/activity`);
 }

package/src/capabilities/index.ts

@@ -4,6 +4,7 @@
 
 import { lazy } from '@dxos/app-framework';
 
+export const AppGraphBuilder = lazy(() => import('./app-graph-builder'));
 export const IntentResolver = lazy(() => import('./intent-resolver'));
 export const Markdown = lazy(() => import('./markdown'));
 export const ReactSurface = lazy(() => import('./react-surface'));

package/src/capabilities/intent-resolver.ts

@@ -2,21 +2,17 @@
 // Copyright 2025 DXOS.org
 //
 
-import {
-  Capabilities,
-  contributes,
-  createIntent,
-  createResolver,
-  LayoutAction,
-  type PluginsContext,
-} from '@dxos/app-framework';
+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 { create, fullyQualifiedId, getSpace, makeRef } from '@dxos/react-client/echo';
+import { MessageType } from '@dxos/schema';
 
 import { ThreadCapabilities } from './capabilities';
 import { THREAD_PLUGIN } from '../meta';
@@ -63,22 +59,19 @@ export default (context: PluginsContext) =>
           data: { object: thread },
           intents: [
             createIntent(ThreadAction.Select, { current: fullyQualifiedId(thread) }),
-            createIntent(LayoutAction.UpdateComplementary, { part: 'complementary', subject: 'comments' }),
+            createIntent(DeckAction.ChangeCompanion, {
+              primary: subjectId,
+              companion: `${subjectId}${ATTENDABLE_PATH_SEPARATOR}comments`,
+            }),
           ],
         };
       },
     }),
     createResolver({
       intent: ThreadAction.Select,
-      resolve: ({ current, skipOpen }) => {
+      resolve: ({ current }) => {
         const { state } = context.requestCapability(ThreadCapabilities.MutableState);
         state.current = current;
-
-        return {
-          intents: !skipOpen
-            ? [createIntent(LayoutAction.UpdateComplementary, { part: 'complementary', subject: 'comments' })]
-            : undefined,
-        };
       },
     }),
     createResolver({
@@ -91,13 +84,17 @@ export default (context: PluginsContext) =>
         }
 
         const space = getSpace(thread);
-        const spaceId = space?.id;
+        invariant(space, 'Space not found');
+        const spaceId = space.id;
 
         return {
           intents: [
             createIntent(ObservabilityAction.SendEvent, {
               name: 'threads.toggle-resolved',
-              properties: { threadId: thread.id, spaceId },
+              properties: {
+                spaceId,
+                threadId: thread.id,
+              },
             }),
           ],
         };
@@ -140,7 +137,10 @@ export default (context: PluginsContext) =>
             intents: [
               createIntent(ObservabilityAction.SendEvent, {
                 name: 'threads.delete',
-                properties: { threadId: thread.id, spaceId: space.id },
+                properties: {
+                  spaceId: space.id,
+                  threadId: thread.id,
+                },
               }),
             ],
           };
@@ -153,7 +153,10 @@ export default (context: PluginsContext) =>
             intents: [
               createIntent(ObservabilityAction.SendEvent, {
                 name: 'threads.undo-delete',
-                properties: { threadId: thread.id, spaceId: space.id },
+                properties: {
+                  spaceId: space.id,
+                  threadId: thread.id,
+                },
               }),
             ],
           };
@@ -161,13 +164,22 @@ export default (context: PluginsContext) =>
       },
     }),
     createResolver({
-      intent: ThreadAction.OnMessageAdd,
-      resolve: ({ thread, subject }) => {
+      intent: ThreadAction.AddMessage,
+      resolve: ({ thread, subject, sender, text }) => {
         const { state } = context.requestCapability(ThreadCapabilities.MutableState);
         const subjectId = fullyQualifiedId(subject);
         const space = getSpace(subject);
+        invariant(space, 'Space not found');
         const intents = [];
-        const analyticsProperties = { threadId: thread.id, spaceId: space?.id };
+
+        const message = create(MessageType, {
+          sender,
+          created: new Date().toISOString(),
+          blocks: [{ type: 'text', text }],
+          // TODO(wittjosiah): Context based on attention.
+          // context: context ? makeRef(context) : undefined,
+        });
+        thread.messages.push(makeRef(message));
 
         if (state.drafts[subjectId]?.find((t) => t === thread)) {
           // Move draft to document.
@@ -176,16 +188,25 @@ export default (context: PluginsContext) =>
           state.drafts[subjectId] = state.drafts[subjectId]?.filter(({ id }) => id !== thread.id);
           intents.push(
             createIntent(ObservabilityAction.SendEvent, {
-              name: 'threads.thread-created',
-              properties: analyticsProperties,
+              name: 'threads.create',
+              properties: {
+                spaceId: space.id,
+                threadId: thread.id,
+              },
             }),
           );
         }
 
         intents.push(
           createIntent(ObservabilityAction.SendEvent, {
-            name: 'threads.message-added',
-            properties: { ...analyticsProperties, threadLength: thread.messages.length },
+            name: 'threads.message.add',
+            properties: {
+              spaceId: space.id,
+              threadId: thread.id,
+              threadLength: thread.messages.length,
+              messageId: message.id,
+              messageLength: text.length,
+            },
           }),
         );
 
@@ -196,6 +217,7 @@ export default (context: PluginsContext) =>
       intent: ThreadAction.DeleteMessage,
       resolve: ({ subject, thread, messageId, message, messageIndex }, undo) => {
         const space = getSpace(subject);
+        invariant(space, 'Space not found');
 
         if (!undo) {
           const messageIndex = thread.messages.findIndex(Ref.hasObjectId(messageId));
@@ -221,7 +243,11 @@ export default (context: PluginsContext) =>
             intents: [
               createIntent(ObservabilityAction.SendEvent, {
                 name: 'threads.message.delete',
-                properties: { threadId: thread.id, spaceId: space?.id },
+                properties: {
+                  spaceId: space.id,
+                  threadId: thread.id,
+                  messageId: message.id,
+                },
               }),
             ],
           };
@@ -235,7 +261,11 @@ export default (context: PluginsContext) =>
             intents: [
               createIntent(ObservabilityAction.SendEvent, {
                 name: 'threads.message.undo-delete',
-                properties: { threadId: thread.id, spaceId: space?.id },
+                properties: {
+                  spaceId: space.id,
+                  threadId: thread.id,
+                  messageId: message.id,
+                },
               }),
             ],
           };

package/src/capabilities/react-surface.tsx

@@ -6,11 +6,12 @@ import React from 'react';
 
 import { Capabilities, contributes, createSurface, useLayout } from '@dxos/app-framework';
 import { type Ref } from '@dxos/echo-schema';
+import { DXN } from '@dxos/keys';
 import { SettingsStore } from '@dxos/local-storage';
 import { ChannelType, type ThreadType } from '@dxos/plugin-space/types';
-import { getSpace } from '@dxos/react-client/echo';
+import { getSpace, isSpace, type Space } from '@dxos/react-client/echo';
 
-import { ChannelContainer, ThreadComplementary, ThreadSettings } from '../components';
+import { ChatContainer, ThreadComplementary, ThreadSettings } from '../components';
 import { THREAD_PLUGIN } from '../meta';
 import { type ThreadSettingsProps } from '../types';
 
@@ -25,22 +26,35 @@ export default () =>
         const currentPosition = layout.active.findIndex((id) => id === channel.id);
         const objectToTheLeft = layout.active[currentPosition - 1];
         const context = currentPosition > 0 ? getSpace(channel)?.db.getObjectById(objectToTheLeft) : undefined;
-        return <ChannelContainer role={role} channel={channel} context={context} />;
+        const space = getSpace(channel);
+        if (!space) {
+          return null;
+        }
+
+        return <ChatContainer space={space} dxn={channel.queue.dxn} context={context} />;
       },
     }),
     createSurface({
-      id: `${THREAD_PLUGIN}/thread`,
-      role: 'complementary--comments',
-      filter: (data): data is { subject: { threads: Ref<ThreadType>[] } } =>
-        !!data.subject &&
-        typeof data.subject === 'object' &&
-        'threads' in data.subject &&
-        Array.isArray(data.subject.threads) &&
-        !(data.subject instanceof ChannelType),
-      component: ({ data }) => <ThreadComplementary subject={data.subject} />,
+      id: `${THREAD_PLUGIN}/comments`,
+      role: 'article',
+      filter: (data): data is { companionTo: { threads: Ref<ThreadType>[] } } =>
+        data.subject === 'comments' &&
+        !!data.companionTo &&
+        typeof data.companionTo === 'object' &&
+        'threads' in data.companionTo &&
+        Array.isArray(data.companionTo.threads),
+      // TODO(wittjosiah): This isn't scrolling properly in a plank.
+      component: ({ data }) => <ThreadComplementary subject={data.companionTo} />,
+    }),
+    createSurface({
+      id: `${THREAD_PLUGIN}/tabpanel`,
+      role: 'tabpanel',
+      filter: (data): data is { subject: DXN; space: Space } =>
+        data.subject instanceof DXN && data.type === 'chat' && isSpace(data.space),
+      component: ({ data: { subject: dxn, space } }) => <ChatContainer dxn={dxn} space={space} />,
     }),
     createSurface({
-      id: `${THREAD_PLUGIN}/settings`,
+      id: `${THREAD_PLUGIN}/plugin-settings`,
       role: 'article',
       filter: (data): data is { subject: SettingsStore<ThreadSettingsProps> } =>
         data.subject instanceof SettingsStore && data.subject.prefix === THREAD_PLUGIN,

package/src/components/ChatContainer.tsx

@@ -85,7 +85,7 @@ export const ChatContainer = ({ space, dxn, context, current, autoFocusTextbox }
 
     queue.append([
       createStatic(MessageType, {
-        sender: { identityKey: identity.identityKey.toHex() },
+        sender: { identityDid: identity.did },
         created: new Date().toISOString(),
         blocks: [{ type: 'text', text: messageRef.current }],
         properties: context ? { context: makeRef(context) } : undefined,
@@ -124,3 +124,5 @@ export const ChatContainer = ({ space, dxn, context, current, autoFocusTextbox }
     </Thread>
   );
 };
+
+export default ChatContainer;

package/src/components/MessageContainer.tsx

@@ -43,10 +43,12 @@ export const MessageContainer = ({
   onDelete?: (id: string) => void;
 }) => {
   const senderIdentity = members.find(
-    (member) => message.sender.identityKey && PublicKey.equals(member.identity.identityKey, message.sender.identityKey),
+    (member) =>
+      (message.sender.identityDid && member.identity.did === message.sender.identityDid) ||
+      (message.sender.identityKey && PublicKey.equals(member.identity.identityKey, message.sender.identityKey)),
   )?.identity;
   const messageMetadata = getMessageMetadata(message.id, senderIdentity);
-  const userIsAuthor = useIdentity()?.identityKey.toHex() === messageMetadata.authorId;
+  const userIsAuthor = useIdentity()?.did === messageMetadata.authorId;
   const [editing, setEditing] = useState(false);
   const handleDelete = useCallback(() => onDelete?.(message.id), [message, onDelete]);
   const { t } = useTranslation(THREAD_PLUGIN);
@@ -144,7 +146,7 @@ const TextboxBlock = ({
     () => ({
       initialValue: block.text,
       extensions: [
-        createBasicExtensions({ readonly: !isAuthor || !editing }),
+        createBasicExtensions({ readOnly: !isAuthor || !editing }),
         createThemeExtensions({ themeMode }),
         command,
         EditorView.updateListener.of((update) => {