@dxos/plugin-thread 0.8.1-main.ba2dec9 → 0.8.1-staging.5be625a

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

@@ -2,11 +2,9 @@ declare const _default: {
     'en-US': {
         [x: string]: {
             'typename label': string;
+            'object name placeholder': string;
             'plugin name'?: undefined;
-            'channel name placeholder'?: undefined;
             'channel title label'?: undefined;
-            'delete channel label'?: undefined;
-            'create channel label'?: undefined;
             'message placeholder'?: undefined;
             'activity message'?: undefined;
             'anonymous label'?: undefined;
@@ -33,10 +31,7 @@ declare const _default: {
             'show unresolved label'?: undefined;
         } | {
             'plugin name': string;
-            'channel name placeholder': string;
             'channel title label': string;
-            'delete channel label': string;
-            'create channel label': string;
             'message placeholder': string;
             'activity message': string;
             'anonymous label': string;
@@ -62,13 +57,11 @@ declare const _default: {
             'show all label': string;
             'show unresolved label': string;
             'typename label'?: undefined;
+            'object name placeholder'?: undefined;
         };
         "dxos.org/plugin/thread": {
             'plugin name': string;
-            'channel name placeholder': string;
             'channel title label': string;
-            'delete channel label': string;
-            'create channel label': string;
             'message placeholder': string;
             'activity message': string;
             'anonymous label': string;

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

@@ -1 +1 @@
-{"version":3,"file":"translations.d.ts","sourceRoot":"","sources":["../../../src/translations.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,wBAwCE"}
+{"version":3,"file":"translations.d.ts","sourceRoot":"","sources":["../../../src/translations.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,wBAsCE"}

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

@@ -1,16 +1,30 @@
 import { S } from '@dxos/echo-schema';
-import { ChannelType, MessageType, ThreadType } from '@dxos/plugin-space/types';
+import { ChannelType, ThreadType } from '@dxos/plugin-space/types';
+import { MessageType } from '@dxos/schema';
 export declare namespace ThreadAction {
+    const CreateChannel_base: S.TaggedClass<CreateChannel, "dxos.org/plugin/thread/action/create-channel", {
+        readonly _tag: S.tag<"dxos.org/plugin/thread/action/create-channel">;
+    } & {
+        input: S.Struct<{
+            spaceId: typeof S.String;
+            name: S.optional<typeof S.String>;
+        }>;
+        output: S.Struct<{
+            object: typeof ChannelType;
+        }>;
+    }>;
+    export class CreateChannel extends CreateChannel_base {
+    }
     const Create_base: S.TaggedClass<Create, "dxos.org/plugin/thread/action/create", {
         readonly _tag: S.tag<"dxos.org/plugin/thread/action/create">;
     } & {
         input: S.Struct<{
             name: S.optional<typeof S.String>;
-            cursor: S.optional<typeof S.String>;
-            subject: S.optional<S.Schema<import("@dxos/echo-db").ReactiveEchoObject<any>, import("@dxos/echo-db").ReactiveEchoObject<any>, never>>;
+            cursor: typeof S.String;
+            subject: S.Schema<import("@dxos/echo-db").ReactiveEchoObject<any>, import("@dxos/echo-db").ReactiveEchoObject<any>, never>;
         }>;
         output: S.Struct<{
-            object: S.Union<[typeof ChannelType, typeof ThreadType]>;
+            object: typeof ThreadType;
         }>;
     }>;
     export class Create extends Create_base {
@@ -86,6 +100,8 @@ export type ViewState = {
 };
 export type ViewStore = Record<SubjectId, ViewState>;
 export type ThreadState = {
+    /** Current channel activity. */
+    activities: Record<string, string | undefined>;
     /** In-memory draft threads. */
     drafts: Record<string, ThreadType[]>;
     current?: string | undefined;

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,WAAW,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAKhF,yBAAiB,YAAY,CAAC;;;;;;;;;;;;;IAG5B,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,+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;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"}

package/package.json

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

package/src/ThreadPlugin.tsx

@@ -7,11 +7,13 @@ 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, MessageType, ThreadType } from '@dxos/plugin-space/types';
+import { ChannelType, defineObjectForm, ThreadType } from '@dxos/plugin-space/types';
 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 { ThreadEvents as LocalThreadEvents } from './events';
 import { meta, THREAD_ITEM, THREAD_PLUGIN } from './meta';
 import translations from './translations';
 import { ThreadAction } from './types';
@@ -46,10 +48,7 @@ export const ThreadPlugin = () =>
         contributes(Capabilities.Metadata, {
           id: ChannelType.typename,
           metadata: {
-            placeholder: ['channel name placeholder', { ns: THREAD_PLUGIN }],
             icon: 'ph--chat--regular',
-            // TODO(wittjosiah): Move out of metadata.
-            loadReferences: async (channel: ChannelType) => await RefArray.loadAll(channel.threads ?? []),
           },
         }),
         contributes(Capabilities.Metadata, {
@@ -91,14 +90,19 @@ export const ThreadPlugin = () =>
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
             objectSchema: ChannelType,
-            getIntent: () => createIntent(ThreadAction.Create),
+            getIntent: (_, options) => createIntent(ThreadAction.CreateChannel, { spaceId: options.space.id }),
           }),
         ),
     }),
     defineModule({
       id: `${meta.id}/module/schema`,
       activatesOn: ClientEvents.SetupSchema,
-      activate: () => contributes(ClientCapabilities.Schema, [ThreadType, MessageType]),
+      activate: () => contributes(ClientCapabilities.Schema, [ThreadType, MessageType, MessageTypeV1]),
+    }),
+    defineModule({
+      id: `${meta.id}/module/migration`,
+      activatesOn: ClientEvents.SetupMigration,
+      activate: () => contributes(ClientCapabilities.Migration, [MessageTypeV1ToV2]),
     }),
     defineModule({
       id: `${meta.id}/module/complementary-panel`,
@@ -128,7 +132,7 @@ export const ThreadPlugin = () =>
       id: `${meta.id}/module/react-surface`,
       activatesOn: Events.SetupReactSurface,
       // TODO(wittjosiah): Should occur before the comments thread is loaded when surfaces activation is more granular.
-      activatesBefore: [ThreadEvents.SetupThread],
+      activatesBefore: [ThreadEvents.SetupThread, LocalThreadEvents.SetupActivity],
       activate: ReactSurface,
     }),
     defineModule({

package/src/capabilities/capabilities.ts

@@ -3,6 +3,7 @@
 //
 
 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';
@@ -16,4 +17,9 @@ 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/intent-resolver.ts

@@ -10,7 +10,9 @@ import {
   LayoutAction,
   type PluginsContext,
 } from '@dxos/app-framework';
-import { Ref } from '@dxos/echo-schema';
+import { ObjectId, Ref } from '@dxos/echo-schema';
+import { DXN, QueueSubspaceTags } from '@dxos/keys';
+import { refFromDXN } from '@dxos/live-object';
 import { log } from '@dxos/log';
 import { ObservabilityAction } from '@dxos/plugin-observability/types';
 import { ChannelType, ThreadType } from '@dxos/plugin-space/types';
@@ -22,44 +24,48 @@ import { ThreadAction } from '../types';
 
 export default (context: PluginsContext) =>
   contributes(Capabilities.IntentResolver, [
+    createResolver({
+      intent: ThreadAction.CreateChannel,
+      resolve: ({ spaceId, name }) => ({
+        data: {
+          object: create(ChannelType, {
+            name,
+            queue: refFromDXN(new DXN(DXN.kind.QUEUE, [QueueSubspaceTags.DATA, spaceId, ObjectId.random()])),
+          }),
+        },
+      }),
+    }),
     createResolver({
       intent: ThreadAction.Create,
       resolve: ({ name, cursor, subject }) => {
-        if (cursor && subject) {
-          // Seed the threads array if it does not exist.
-          if (subject?.threads === undefined) {
-            try {
-              // Static schema will throw an error if subject does not support threads array property.
-              subject.threads = [];
-            } catch (err) {
-              log.error('Subject does not support threads array', { typename: subject?.typename });
-              return;
-            }
-          }
-
-          const { state } = context.requestCapability(ThreadCapabilities.MutableState);
-          const subjectId = fullyQualifiedId(subject);
-          const thread = create(ThreadType, { name, anchor: cursor, messages: [], status: 'staged' });
-          const draft = state.drafts[subjectId];
-          if (draft) {
-            draft.push(thread);
-          } else {
-            state.drafts[subjectId] = [thread];
+        // Seed the threads array if it does not exist.
+        if (subject?.threads === undefined) {
+          try {
+            // Static schema will throw an error if subject does not support threads array property.
+            subject.threads = [];
+          } catch (err) {
+            log.error('Subject does not support threads array', { typename: subject?.typename });
+            return;
           }
+        }
 
-          return {
-            data: { object: thread },
-            intents: [
-              createIntent(ThreadAction.Select, { current: fullyQualifiedId(thread) }),
-              createIntent(LayoutAction.UpdateComplementary, { part: 'complementary', subject: 'comments' }),
-            ],
-          };
+        const { state } = context.requestCapability(ThreadCapabilities.MutableState);
+        const subjectId = fullyQualifiedId(subject);
+        const thread = create(ThreadType, { name, anchor: cursor, messages: [], status: 'staged' });
+        const draft = state.drafts[subjectId];
+        if (draft) {
+          draft.push(thread);
         } else {
-          // TODO(wittjosiah): Create separate intent for channel creation.
-          return {
-            data: { object: create(ChannelType, { threads: [makeRef(create(ThreadType, { messages: [] }))] }) },
-          };
+          state.drafts[subjectId] = [thread];
         }
+
+        return {
+          data: { object: thread },
+          intents: [
+            createIntent(ThreadAction.Select, { current: fullyQualifiedId(thread) }),
+            createIntent(LayoutAction.UpdateComplementary, { part: 'complementary', subject: 'comments' }),
+          ],
+        };
       },
     }),
     createResolver({
@@ -220,7 +226,7 @@ export default (context: PluginsContext) =>
             ],
           };
         } else {
-          if (!messageIndex || !message) {
+          if (messageIndex === undefined || !message) {
             return;
           }
 

package/src/capabilities/react-surface.tsx

@@ -10,7 +10,7 @@ import { SettingsStore } from '@dxos/local-storage';
 import { ChannelType, type ThreadType } from '@dxos/plugin-space/types';
 import { getSpace } from '@dxos/react-client/echo';
 
-import { ThreadContainer, ThreadComplementary, ThreadSettings } from '../components';
+import { ChannelContainer, ThreadComplementary, ThreadSettings } from '../components';
 import { THREAD_PLUGIN } from '../meta';
 import { type ThreadSettingsProps } from '../types';
 
@@ -19,25 +19,13 @@ export default () =>
     createSurface({
       id: `${THREAD_PLUGIN}/channel`,
       role: 'article',
-      filter: (data): data is { subject: ChannelType } =>
-        data.subject instanceof ChannelType && !!data.subject.threads[0],
-      component: ({ data, role }) => {
+      filter: (data): data is { subject: ChannelType } => data.subject instanceof ChannelType,
+      component: ({ data: { subject: channel }, role }) => {
         const layout = useLayout();
-        const channel = data.subject;
-        void channel.threads[0].load();
-        const thread = channel.threads[0].target;
-        if (!thread) {
-          return null;
-        }
-
         const currentPosition = layout.active.findIndex((id) => id === channel.id);
-        if (currentPosition > 0) {
-          const objectToTheLeft = layout.active[currentPosition - 1];
-          const context = getSpace(channel)?.db.getObjectById(objectToTheLeft);
-          return <ThreadContainer role={role} thread={thread} context={context} />;
-        }
-
-        return <ThreadContainer role={role} thread={thread} />;
+        const objectToTheLeft = layout.active[currentPosition - 1];
+        const context = currentPosition > 0 ? getSpace(channel)?.db.getObjectById(objectToTheLeft) : undefined;
+        return <ChannelContainer role={role} channel={channel} context={context} />;
       },
     }),
     createSurface({

package/src/capabilities/state.ts

@@ -11,7 +11,7 @@ import { type ThreadState, type ViewStore } from '../types';
 const initialViewState = { showResolvedThreads: false };
 
 export default () => {
-  const state = create<ThreadState>({ drafts: {} });
+  const state = create<ThreadState>({ activities: {}, drafts: {} });
   const viewStore = create<ViewStore>({});
 
   const getViewState = (subjectId: string) => {

package/src/components/ChannelContainer.tsx

@@ -0,0 +1,80 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import React, { useCallback, type ComponentProps } from 'react';
+
+import { Surface, useCapabilities, useCapability } from '@dxos/app-framework';
+import { type NodeArg } from '@dxos/plugin-graph';
+import { type ChannelType } from '@dxos/plugin-space/types';
+import { fullyQualifiedId, getSpace } from '@dxos/react-client/echo';
+import { createEditorActionGroup } from '@dxos/react-ui-editor';
+import {
+  createMenuAction,
+  MenuProvider,
+  ToolbarMenu,
+  type ToolbarMenuActionGroupProperties,
+  useMenuActions,
+  type MenuAction,
+} from '@dxos/react-ui-menu';
+import { StackItem } from '@dxos/react-ui-stack';
+
+import { ChatContainer } from './ChatContainer';
+import { ThreadCapabilities } from '../capabilities';
+
+const useActivitiesMenu = (activities: ThreadCapabilities.Activity[], activity: string | undefined) => {
+  return useMenuActions(() => ({
+    nodes: [
+      createEditorActionGroup('activities', {
+        variant: 'toggleGroup',
+        selectCardinality: 'single',
+        value: activity,
+      } as ToolbarMenuActionGroupProperties) as NodeArg<any>,
+      ...activities.map(({ id, ...properties }) =>
+        createMenuAction(id, {
+          ...properties,
+          checked: true,
+        }),
+      ),
+    ],
+    edges: [
+      { source: 'root', target: 'activities' },
+      ...activities.map((activity) => ({ source: 'activities', target: activity.id })),
+    ],
+  }));
+};
+
+const ChannelContainer = ({
+  role,
+  channel,
+  context,
+}: Pick<ComponentProps<typeof ChatContainer>, 'context'> & { channel: ChannelType; role: string }) => {
+  const { state } = useCapability(ThreadCapabilities.MutableState);
+  const currentActivity = state.activities[channel.id];
+  const activities = useCapabilities(ThreadCapabilities.Activity);
+  const menu = useActivitiesMenu(activities, currentActivity);
+  const handleAction = useCallback(
+    (action: MenuAction) => (state.activities[channel.id] = currentActivity === action.id ? undefined : action.id),
+    [currentActivity],
+  );
+
+  const space = getSpace(channel);
+  if (!space) {
+    return null;
+  }
+
+  return (
+    <StackItem.Content toolbar>
+      <MenuProvider {...menu} onAction={handleAction} attendableId={fullyQualifiedId(channel)}>
+        <ToolbarMenu />
+      </MenuProvider>
+      {currentActivity ? (
+        <Surface role={`channel-activity--${currentActivity}`} data={{ subject: channel }} />
+      ) : (
+        <ChatContainer space={space} dxn={channel.queue.dxn} context={context} />
+      )}
+    </StackItem.Content>
+  );
+};
+
+export default ChannelContainer;

package/src/components/Chat.stories.tsx

@@ -7,19 +7,22 @@ import '@dxos-theme';
 import { type Meta } from '@storybook/react';
 import React, { useEffect, useState } from 'react';
 
-import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
+import { Capabilities, contributes, createSurface, IntentPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { MessageType, ThreadType } from '@dxos/plugin-space/types';
+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 { 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 { MessageType } from '@dxos/schema';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { ChatContainer } from './ChatContainer';
-import { createChatThread } from './testing';
 import translations from '../translations';
 
 faker.seed(1);
@@ -28,25 +31,31 @@ const Story = () => {
   const client = useClient();
   const identity = useIdentity();
   const [space, setSpace] = useState<Space>();
-  const [thread, setThread] = useState<ThreadType | null>();
+  const [channel, setChannel] = useState<ChannelType | null>();
 
   useEffect(() => {
     if (identity) {
       setTimeout(async () => {
         const space = await client.spaces.create();
-        const thread = space.db.add(createChatThread(identity));
+        const channel = space.db.add(
+          create(ChannelType, {
+            queue: refFromDXN(new DXN(DXN.kind.QUEUE, [QueueSubspaceTags.DATA, space.id, ObjectId.random()])),
+          }),
+        );
         setSpace(space);
-        setThread(thread);
+        setChannel(channel);
       });
     }
   }, [identity]);
 
-  if (!identity || !thread) {
+  if (!identity || !channel || !space) {
     return null;
   }
 
   return (
-    <main className='max-is-prose mli-auto bs-dvh overflow-hidden'>{space && <ChatContainer thread={thread} />}</main>
+    <main className='max-is-prose mli-auto bs-dvh overflow-hidden'>
+      <ChatContainer space={space} dxn={channel.queue.dxn} />
+    </main>
   );
 };
 
@@ -58,6 +67,7 @@ const meta: Meta = {
   render: () => <Story />,
   decorators: [
     withPluginManager({
+      plugins: [IntentPlugin()],
       capabilities: [
         contributes(
           Capabilities.ReactSurface,