@dxos/plugin-thread 0.8.4-main.bc674ce → 0.8.4-main.c351d160a8

package/src/{components/Chat.stories.tsx → containers/ChatContainer/ChatContainer.stories.tsx}

@@ -5,21 +5,21 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
-import { Capability, Common, OperationPlugin } from '@dxos/app-framework';
+import { Capabilities, Capability, OperationPlugin, RuntimePlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
+import { Surface } from '@dxos/app-framework/ui';
 import { faker } from '@dxos/random';
 import { useClient } from '@dxos/react-client';
 import { type Space } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { useAsyncEffect } from '@dxos/react-ui';
-import { withTheme } from '@dxos/react-ui/testing';
+import { withLayout, withTheme, Loading } from '@dxos/react-ui/testing';
 import { Thread as ThreadComponent } from '@dxos/react-ui-thread';
-import { render } from '@dxos/storybook-utils';
 import { Message, Thread } from '@dxos/types';
 
-import { translations } from '../translations';
-import { Channel } from '../types';
+import { translations } from '../../translations';
+import { Channel } from '../../types';
 
 import { ChatContainer } from './ChatContainer';
 
@@ -41,28 +41,27 @@ const DefaultStory = () => {
   }, [identity]);
 
   if (!identity || !channel || !space || !channel.defaultThread.target) {
-    return null;
+    return <Loading data={{ identity: !!identity, space: !!space, channel: !!channel }} />;
   }
 
-  return (
-    <main className='is-full max-is-proseMaxWidth mli-auto bs-full overflow-hidden'>
-      <ChatContainer space={space} thread={channel.defaultThread.target} />
-    </main>
-  );
+  return <ChatContainer space={space} thread={channel.defaultThread.target} />;
 };
 
 const meta = {
-  title: 'plugins/plugin-thread/Chat',
+  title: 'plugins/plugin-thread/containers/ChatContainer',
   component: ThreadComponent.Root as any,
-  render: render(DefaultStory),
+  render: DefaultStory,
   decorators: [
-    withTheme,
+    withTheme(),
+    withLayout({ layout: 'column' }),
+    // TODO(wittjosiah): This shouldn't depend on app framework (use withClientProvider instead).
+    //  Currently this is required due to useOnEditAnalytics.
     withPluginManager({
-      plugins: [OperationPlugin()],
+      plugins: [OperationPlugin(), RuntimePlugin()],
       capabilities: [
         Capability.contributes(
-          Common.Capability.ReactSurface,
-          Common.createSurface({
+          Capabilities.ReactSurface,
+          Surface.create({
             id: 'test',
             role: 'card',
             component: ({ role }) => <span>{JSON.stringify({ role })}</span>,
@@ -70,7 +69,10 @@ const meta = {
         ),
       ],
     }),
-    withClientProvider({ createSpace: true, types: [Thread.Thread, Channel.Channel, Message.Message] }),
+    withClientProvider({
+      createSpace: true,
+      types: [Thread.Thread, Channel.Channel, Message.Message],
+    }),
   ],
   parameters: {
     layout: 'fullscreen',

package/src/{components → containers/ChatContainer}/ChatContainer.tsx

@@ -21,24 +21,11 @@ import { createBasicExtensions, createThemeExtensions, listener } from '@dxos/ui
 import { mx } from '@dxos/ui-theme';
 import { isNonNullable } from '@dxos/util';
 
-import { useStatus } from '../hooks';
-import { meta } from '../meta';
-import { getMessageMetadata } from '../util';
-
-import { command } from './command-extension';
-import { MessageContainer } from './MessageContainer';
-
-export const ChatHeading = ({ attendableId }: { attendableId?: string }) => {
-  const { t } = useTranslation(meta.id);
-  return (
-    <div role='none' className='flex items-center'>
-      <StackItem.SigilButton attendableId={attendableId}>
-        <Icon icon='ph--chat--regular' size={5} />
-      </StackItem.SigilButton>
-      <StackItem.HeadingLabel attendableId={attendableId}>{t('chat heading')}</StackItem.HeadingLabel>
-    </div>
-  );
-};
+import { MessagePanel } from '../../components';
+import { command } from '../../extensions';
+import { useStatus } from '../../hooks';
+import { meta } from '../../meta';
+import { getMessageMetadata } from '../../util';
 
 export type ChatContainerProps = ThemedClassName<
   {
@@ -54,20 +41,22 @@ export const ChatContainer = ({
   space,
   thread,
   context,
-  current,
   autoFocusTextbox,
+  current,
 }: ChatContainerProps) => {
   const { t } = useTranslation(meta.id);
+  const { themeMode } = useThemeContext();
+
   const id = Obj.getDXN(thread).toString();
   const identity = useIdentity()!;
   const members = useMembers(space?.id);
   const activity = useStatus(space, id);
+  const [autoFocus, setAutoFocus] = useState(autoFocusTextbox);
+  const threadScrollRef = useRef<HTMLDivElement | null>(null);
+
   // TODO(wittjosiah): This is a hack to reset the editor after a message is sent.
   const [_count, _setCount] = useState(0);
   const rerenderEditor = () => _setCount((count) => count + 1);
-  const [autoFocus, setAutoFocus] = useState(autoFocusTextbox);
-  const threadScrollRef = useRef<HTMLDivElement | null>(null);
-  const { themeMode } = useThemeContext();
 
   const textboxMetadata = getMessageMetadata(id, identity);
   const messageRef = useRef('');
@@ -120,30 +109,21 @@ export const ChatContainer = ({
 
   return (
     <ThreadComponent.Root
-      current={current}
       id={id}
-      classNames={[
-        'bs-full grid-rows-[1fr_min-content_min-content] overflow-hidden',
-        'transition-[padding-block-end] [[data-sidebar-inline-start-state=open]_&]:lg:pbe-0',
-        classNames,
-      ]}
+      current={current}
+      classNames={['dx-container grid-rows-[1fr_min-content_min-content]', classNames]}
     >
-      <ScrollArea.Root classNames='col-span-2'>
-        <ScrollArea.Viewport classNames='overflow-anchored after:overflow-anchor after:block after:bs-px after:-mbs-px [&>div]:min-bs-full [&>div]:!grid [&>div]:grid-rows-[1fr_0]'>
+      <ScrollArea.Root classNames='col-span-2' orientation='vertical'>
+        <ScrollArea.Viewport ref={threadScrollRef}>
           <div role='none' className={mx(threadLayout, 'place-self-end')}>
             {thread.messages
               .map((message) => message.target)
               .filter(isNonNullable)
               .map((message) => (
-                <MessageContainer key={message.id} message={message} members={members} />
+                <MessagePanel key={message.id} message={message} members={members} />
               ))}
           </div>
-          {/* NOTE(thure): This can’t also be the `overflow-anchor` because `ScrollArea` injects an interceding node that contains this necessary ref’d element. */}
-          <div role='none' className='bs-px -mbs-px' ref={threadScrollRef} />
         </ScrollArea.Viewport>
-        <ScrollArea.Scrollbar>
-          <ScrollArea.Thumb />
-        </ScrollArea.Scrollbar>
       </ScrollArea.Root>
 
       <MessageTextbox extensions={extensions} autoFocus={autoFocus} onSend={handleCreate} {...textboxMetadata} />
@@ -152,4 +132,14 @@ export const ChatContainer = ({
   );
 };
 
-export default ChatContainer;
+export const ChatHeading = ({ attendableId }: { attendableId?: string }) => {
+  const { t } = useTranslation(meta.id);
+  return (
+    <div role='none' className='flex items-center'>
+      <StackItem.SigilButton attendableId={attendableId}>
+        <Icon icon='ph--chat--regular' size={5} />
+      </StackItem.SigilButton>
+      <StackItem.HeadingLabel attendableId={attendableId}>{t('chat heading')}</StackItem.HeadingLabel>
+    </div>
+  );
+};

package/src/containers/ChatContainer/index.ts

@@ -0,0 +1,8 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { ChatContainer } from './ChatContainer';
+
+export { ChatContainer };
+export default ChatContainer;

package/src/{components → containers/ThreadCompanion}/ThreadCompanion.tsx

@@ -5,30 +5,30 @@
 import { useAtomValue } from '@effect-atom/atom-react';
 import React, { useCallback, useMemo } from 'react';
 
-import { Common } from '@dxos/app-framework';
-import { useCapabilities, useCapability, useOperationInvoker } from '@dxos/app-framework/react';
+import { Capabilities } from '@dxos/app-framework';
+import { useCapabilities, useCapability, useOperationInvoker } from '@dxos/app-framework/ui';
+import { AppCapabilities, CollaborationOperation, LayoutOperation } from '@dxos/app-toolkit';
 import { Filter, Obj, Query, Relation } from '@dxos/echo';
 import { Ref, useQuery } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
-import { useTranslation } from '@dxos/react-ui';
-import { useAttended } from '@dxos/react-ui-attention';
-import { Layout } from '@dxos/react-ui-mosaic';
+import { Panel, ScrollArea, Toolbar, useTranslation } from '@dxos/react-ui';
+import { getParentId, useAttention } from '@dxos/react-ui-attention';
 import { Tabs } from '@dxos/react-ui-tabs';
 import { AnchoredTo, Thread } from '@dxos/types';
-import { mx } from '@dxos/ui-theme';
 
-import { CommentsContainer, type CommentsContainerProps } from '../components';
-import { meta } from '../meta';
-import { ThreadCapabilities, ThreadOperation, type ViewState } from '../types';
+import { CommentsPanel, type CommentsPanelProps } from '../../components';
+import { meta } from '../../meta';
+import { ThreadCapabilities, ThreadOperation, type ViewState } from '../../types';
 
 const initialViewState: ViewState = { showResolvedThreads: false };
 
-export const ThreadCompanion = ({ subject }: { subject: any }) => {
+export const ThreadCompanion = ({ attendableId, subject }: { attendableId?: string; subject: any }) => {
   const { t } = useTranslation(meta.id);
   const { invokePromise } = useOperationInvoker();
   const identity = useIdentity();
   const subjectId = Obj.getDXN(subject).toString();
-  const registry = useCapability(Common.Capability.AtomRegistry);
+  const parentId = attendableId ? getParentId(attendableId) : undefined;
+  const registry = useCapability(Capabilities.AtomRegistry);
 
   const stateAtom = useCapability(ThreadCapabilities.State);
   const viewStoreAtom = useCapability(ThreadCapabilities.ViewState);
@@ -56,7 +56,7 @@ export const ThreadCompanion = ({ subject }: { subject: any }) => {
     [registry, viewStoreAtom, subjectId],
   );
 
-  const anchorSorts = useCapabilities(Common.Capability.AnchorSort);
+  const anchorSorts = useCapabilities(AppCapabilities.AnchorSort);
   const sort = useMemo(
     () => anchorSorts.find(({ key }) => key === Obj.getTypename(subject))?.sort,
     [anchorSorts, subject],
@@ -69,7 +69,8 @@ export const ThreadCompanion = ({ subject }: { subject: any }) => {
     .filter((anchor) => Obj.instanceOf(Thread.Thread, Relation.getSource(anchor)))
     .concat(drafts ?? []);
 
-  const attended = useAttended();
+  const { hasAttention, isAncestor, isRelated } = useAttention(parentId);
+  const isAttended = hasAttention || isAncestor || isRelated;
 
   const handleAttend = useCallback(
     (anchor: AnchoredTo.AnchoredTo) => {
@@ -82,14 +83,14 @@ export const ThreadCompanion = ({ subject }: { subject: any }) => {
         // TODO(wittjosiah): Should this be a thread-specific intent?
         //  The layout doesn't know about threads and this working depends on other plugins conditionally handling it.
         //  This may be overloading this intent or highjacking its intended purpose.
-        void invokePromise(Common.LayoutOperation.ScrollIntoView, {
-          subject: Obj.getDXN(subject).toString(),
+        void invokePromise(LayoutOperation.ScrollIntoView, {
+          subject: parentId,
           cursor: anchor.anchor,
           ref: threadId,
         });
       }
     },
-    [state.current, invokePromise, subject, registry, stateAtom],
+    [state.current, invokePromise, registry, stateAtom, parentId],
   );
 
   const handleComment = useCallback(
@@ -130,7 +131,7 @@ export const ThreadCompanion = ({ subject }: { subject: any }) => {
     [invokePromise, subject],
   );
 
-  const handleAcceptProposal = useCallback<NonNullable<CommentsContainerProps['onAcceptProposal']>>(
+  const handleAcceptProposal = useCallback<NonNullable<CommentsPanelProps['onAcceptProposal']>>(
     async (anchor, messageId) => {
       const thread = Relation.getSource(anchor) as Thread.Thread;
       const messageIndex = thread.messages.findIndex(Ref.hasObjectId(messageId));
@@ -140,7 +141,7 @@ export const ThreadCompanion = ({ subject }: { subject: any }) => {
         return;
       }
 
-      await invokePromise(Common.CollaborationOperation.AcceptProposal, {
+      await invokePromise(CollaborationOperation.AcceptProposal, {
         subject,
         anchor: anchor.anchor,
         proposal,
@@ -151,9 +152,9 @@ export const ThreadCompanion = ({ subject }: { subject: any }) => {
   );
 
   const comments = (
-    <CommentsContainer
+    <CommentsPanel
       anchors={anchors}
-      currentId={attended.includes(subjectId) ? state.current : undefined}
+      currentId={isAttended ? state.current : undefined}
       showResolvedThreads={showResolvedThreads}
       onAttend={handleAttend}
       onComment={handleComment}
@@ -165,29 +166,34 @@ export const ThreadCompanion = ({ subject }: { subject: any }) => {
   );
 
   return (
-    <Layout.Main toolbar>
-      <Tabs.Root
-        value={showResolvedThreads ? 'all' : 'unresolved'}
-        orientation='horizontal'
-        classNames={[
-          'contents [&_[role="tabpanel"]]:min-bs-0 [&_[role="tabpanel"]]:overflow-y-auto [&_[role="tabpanel"]]:scrollbar-thin',
-        ]}
-        onValueChange={onChangeViewState}
-      >
-        {/* TODO(burdon): Standardize (like Tollbar). */}
-        <Tabs.Tablist classNames={mx('bg-toolbarSurface border-be border-subduedSeparator')}>
-          <Tabs.Tab value='unresolved' classNames='text-sm'>
-            {t('show unresolved label')}
-          </Tabs.Tab>
-          <Tabs.Tab value='all' classNames='text-sm'>
-            {t('show all label')}
-          </Tabs.Tab>
-        </Tabs.Tablist>
-        <div className='overflow-y-auto'>
-          <Tabs.Tabpanel value='all'>{showResolvedThreads && comments}</Tabs.Tabpanel>
-          <Tabs.Tabpanel value='unresolved'>{!showResolvedThreads && comments}</Tabs.Tabpanel>
-        </div>
-      </Tabs.Root>
-    </Layout.Main>
+    <Tabs.Root
+      value={showResolvedThreads ? 'all' : 'unresolved'}
+      orientation='horizontal'
+      onValueChange={onChangeViewState}
+    >
+      <Panel.Root>
+        <Panel.Toolbar asChild>
+          <Toolbar.Root>
+            {/* TODO(burdon): TabeList should have the same geometry as Toolbar. */}
+            <Tabs.Tablist classNames='py-0 px-1'>
+              <Tabs.Tab value='unresolved' classNames='text-sm'>
+                {t('show unresolved label')}
+              </Tabs.Tab>
+              <Tabs.Tab value='all' classNames='text-sm'>
+                {t('show all label')}
+              </Tabs.Tab>
+            </Tabs.Tablist>
+          </Toolbar.Root>
+        </Panel.Toolbar>
+        <Panel.Content asChild>
+          <ScrollArea.Root thin>
+            <ScrollArea.Viewport>
+              <Tabs.Tabpanel value='all'>{showResolvedThreads && comments}</Tabs.Tabpanel>
+              <Tabs.Tabpanel value='unresolved'>{!showResolvedThreads && comments}</Tabs.Tabpanel>
+            </ScrollArea.Viewport>
+          </ScrollArea.Root>
+        </Panel.Content>
+      </Panel.Root>
+    </Tabs.Root>
   );
 };

package/src/containers/ThreadCompanion/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { ThreadCompanion } from './ThreadCompanion';
+
+export default ThreadCompanion;

package/src/{components → containers/ThreadSettings}/ThreadSettings.tsx

@@ -5,17 +5,18 @@
 import React from 'react';
 
 import { useTranslation } from '@dxos/react-ui';
-import { ControlPage } from '@dxos/react-ui-form';
+import { Settings } from '@dxos/react-ui-form';
 
-import { meta } from '../meta';
-import type { ThreadSettingsProps } from '../types';
+import { meta } from '../../meta';
+import type { ThreadSettingsProps } from '../../types';
 
 export type ThreadSettingsComponentProps = {
   settings: ThreadSettingsProps;
   onSettingsChange: (fn: (current: ThreadSettingsProps) => ThreadSettingsProps) => void;
 };
 
+// TODO(burdon): Settings.
 export const ThreadSettings = ({ settings: _settings }: ThreadSettingsComponentProps) => {
   const { t: _t } = useTranslation(meta.id);
-  return <ControlPage></ControlPage>;
+  return <Settings.Root></Settings.Root>;
 };

package/src/containers/ThreadSettings/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { ThreadSettings } from './ThreadSettings';
+
+export default ThreadSettings;

package/src/containers/index.ts

@@ -0,0 +1,12 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type ComponentType, lazy } from 'react';
+
+export const CallDebugPanel: ComponentType<any> = lazy(() => import('./CallDebugPanel'));
+export const CallSidebar: ComponentType<any> = lazy(() => import('./CallSidebar'));
+export const ChannelContainer: ComponentType<any> = lazy(() => import('./ChannelContainer'));
+export const ChatContainer: ComponentType<any> = lazy(() => import('./ChatContainer'));
+export const ThreadCompanion: ComponentType<any> = lazy(() => import('./ThreadCompanion'));
+export const ThreadSettings: ComponentType<any> = lazy(() => import('./ThreadSettings'));

package/src/{components/command-extension.ts → extensions/command.ts}

@@ -29,7 +29,7 @@ const parser = StreamLanguage.define<{ count: number }>({
 const styles = HighlightStyle.define([
   {
     tag: tags.tagName,
-    class: mx('dx-tag dx-tag--indigo text-baseText font-medium'),
+    class: mx('dx-tag dx-tag--indigo text-base-surface-text font-medium'),
   },
 ]);
 

package/src/extensions/index.ts

@@ -2,4 +2,5 @@
 // Copyright 2024 DXOS.org
 //
 
+export * from './command';
 export * from './threads';

package/src/functions/create-proposals.ts

@@ -7,28 +7,28 @@ import * as Effect from 'effect/Effect';
 import * as Function from 'effect/Function';
 import * as Schema from 'effect/Schema';
 
-import { ArtifactId, computeDiffsWithCursors } from '@dxos/assistant';
-import { Obj, Ref, Relation } from '@dxos/echo';
-import { Database } from '@dxos/echo';
+import { computeDiffsWithCursors } from '@dxos/assistant';
+import { Database, Obj, Ref, Relation } from '@dxos/echo';
 import { createDocAccessor } from '@dxos/echo-db';
 import { defineFunction } from '@dxos/functions';
-import { DXN } from '@dxos/keys';
 import { Markdown } from '@dxos/plugin-markdown/types';
 import { AnchoredTo, Message, Thread } from '@dxos/types';
 
 export default defineFunction({
-  key: 'dxos.org/function/thread/create-proposals',
+  key: 'org.dxos.function.thread.create-proposals',
   name: 'Create Proposals',
   description: 'Proposes a set of changes to a document.',
   inputSchema: Schema.Struct({
-    id: ArtifactId,
+    doc: Ref.Ref(Markdown.Document).annotations({
+      description: 'The ID of the document.',
+    }),
     diffs: Schema.Array(Schema.String).annotations({
       description: 'The diffs to propose for the document.',
     }),
   }),
   outputSchema: Schema.Void,
-  handler: Effect.fn(function* ({ data: { id, diffs: _diffs } }) {
-    const object = yield* Database.Service.resolve(DXN.parse(id), Markdown.Document);
+  handler: Effect.fn(function* ({ data: { doc, diffs: _diffs } }) {
+    const object = yield* Database.load(doc);
     const content = yield* Effect.promise(() => object.content.load());
     const accessor = createDocAccessor(content, ['content']);
 
@@ -47,8 +47,8 @@ export default defineFunction({
             [Relation.Target]: object,
             anchor: cursor,
           });
-          yield* Database.Service.add(thread);
-          yield* Database.Service.add(relation);
+          yield* Database.add(thread);
+          yield* Database.add(relation);
         }),
       ),
       Effect.allWith({ concurrency: 'unbounded' }),

package/src/functions/index.ts

@@ -2,4 +2,8 @@
 // Copyright 2024 DXOS.org
 //
 
-export { default as createProposals } from './create-proposals';
+import CreateProposals from './create-proposals';
+
+export const ThreadFunctions = {
+  CreateProposals,
+};

package/src/hooks/analytics.ts

@@ -4,7 +4,7 @@
 
 import { useCallback } from 'react';
 
-import { useOperationInvoker } from '@dxos/app-framework/react';
+import { useOperationInvoker } from '@dxos/app-framework/ui';
 import { Obj } from '@dxos/echo';
 import { ObservabilityOperation } from '@dxos/plugin-observability/types';
 import { useOnTransition } from '@dxos/react-ui';
@@ -21,6 +21,7 @@ export const useOnEditAnalytics = (
     if (!message || !textBlock) {
       return;
     }
+
     const db = Obj.getDatabase(message);
     if (!db) {
       return;

package/src/meta.ts

@@ -7,7 +7,7 @@ import { trim } from '@dxos/util';
 
 // TODO(wittjosiah): Needs screenshots.
 export const meta: Plugin.Meta = {
-  id: 'dxos.org/plugin/thread',
+  id: 'org.dxos.plugin.thread',
   name: 'Chat',
   description: trim`
     Multi-modal communication platform supporting text chat, voice, and video conferencing.
@@ -18,4 +18,4 @@ export const meta: Plugin.Meta = {
   source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-thread',
 };
 
-export const THREAD_ITEM = `${meta.id}/item`;
+export const THREAD_ITEM = `${meta.id}.item`;

package/src/testing/stories.ts

@@ -4,9 +4,10 @@
 
 import * as Effect from 'effect/Effect';
 
-import { OperationPlugin, type Plugin, SettingsPlugin } from '@dxos/app-framework';
+import { OperationPlugin, type Plugin } from '@dxos/app-framework';
 import { ClientPlugin } from '@dxos/plugin-client';
 import { GraphPlugin } from '@dxos/plugin-graph';
+import { SettingsPlugin } from '@dxos/plugin-settings';
 import { SpacePlugin } from '@dxos/plugin-space';
 import { ThemePlugin } from '@dxos/plugin-theme';
 import { Config } from '@dxos/react-client';

package/src/translations.ts

@@ -17,6 +17,7 @@ export const translations = [
         'typename label_one': 'Channel',
         'typename label_other': 'Channels',
         'object name placeholder': 'New channel',
+        'add object label': 'Add channel',
         'rename object label': 'Rename channel',
         'delete object label': 'Delete channel',
         'object deleted label': 'Channel deleted',

package/src/types/Channel.ts

@@ -2,22 +2,28 @@
 // Copyright 2025 DXOS.org
 //
 
+// @import-as-namespace
+
 import * as Schema from 'effect/Schema';
 
-import { Obj, Ref, Type } from '@dxos/echo';
+import { Annotation, Obj, Ref, Type } from '@dxos/echo';
 import { FormInputAnnotation } from '@dxos/echo/internal';
 import { Thread } from '@dxos/types';
 
 export const Channel = Schema.Struct({
   name: Schema.optional(Schema.String),
-  defaultThread: Type.Ref(Thread.Thread).pipe(FormInputAnnotation.set(false)),
+  defaultThread: Ref.Ref(Thread.Thread).pipe(FormInputAnnotation.set(false)),
   // TODO(wittjosiah): Should be an "ordered collection".
-  threads: Type.Ref(Thread.Thread).pipe(Schema.Array, FormInputAnnotation.set(false)),
+  threads: Ref.Ref(Thread.Thread).pipe(Schema.Array, FormInputAnnotation.set(false)),
 }).pipe(
   Type.object({
-    typename: 'dxos.org/type/Channel',
+    typename: 'org.dxos.type.channel',
     version: '0.1.0',
   }),
+  Annotation.IconAnnotation.set({
+    icon: 'ph--hash--regular',
+    hue: 'rose',
+  }),
 );
 
 export interface Channel extends Schema.Schema.Type<typeof Channel> {}

package/src/types/capabilities.ts

@@ -11,8 +11,8 @@ import { meta } from '../meta';
 import { type Channel, type ThreadSettingsProps, type ThreadState, type ViewStore } from '../types';
 
 export namespace ThreadCapabilities {
-  export const Settings = Capability.make<Atom.Writable<ThreadSettingsProps>>(`${meta.id}/capability/settings`);
-  export const CallManager = Capability.make<CallManager>(`${meta.id}/capability/call-manager`);
+  export const Settings = Capability.make<Atom.Writable<ThreadSettingsProps>>(`${meta.id}.capability.settings`);
+  export const CallManager = Capability.make<CallManager>(`${meta.id}.capability.call-manager`);
 
   // TODO(burdon): Better way to define specific extensions for meeting companions.
   // TODO(burdon): This brings in deps from ../calls; how should we manage/minimize explicit type exposure to other plugins?
@@ -24,11 +24,11 @@ export namespace ThreadCapabilities {
     onMediaStateUpdated: ([mediaState, isSpeaking]: [MediaState, boolean]) => Promise<void>;
   };
 
-  export const CallExtension = Capability.make<CallProperties>(`${meta.id}/capability/call-extension`);
+  export const CallExtension = Capability.make<CallProperties>(`${meta.id}.capability.call-extension`);
 
   /** Thread state (drafts, toolbar state, current selection). */
-  export const State = Capability.make<Atom.Writable<ThreadState>>(`${meta.id}/capability/state`);
+  export const State = Capability.make<Atom.Writable<ThreadState>>(`${meta.id}.capability.state`);
 
   /** Per-subject view state (e.g., showResolvedThreads). */
-  export const ViewState = Capability.make<Atom.Writable<ViewStore>>(`${meta.id}/capability/view-state`);
+  export const ViewState = Capability.make<Atom.Writable<ViewStore>>(`${meta.id}.capability.view-state`);
 }