@dxos/plugin-thread 0.8.4-main.74a063c4e0 → 0.8.4-main.765dc60934

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-thread",
-  "version": "0.8.4-main.74a063c4e0",
+  "version": "0.8.4-main.765dc60934",
   "description": "DXOS Threads Surface plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,61 +8,89 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
   "imports": {
-    "#blueprints": "./src/blueprints/index.ts",
-    "#capabilities": "./src/capabilities/index.ts",
-    "#components": "./src/components/index.ts",
-    "#containers": "./src/containers/index.ts",
-    "#hooks": "./src/hooks/index.ts",
-    "#meta": "./src/meta.ts",
-    "#operations": "./src/operations/index.ts",
-    "#testing": "./src/testing/index.ts",
-    "#types": "./src/types/index.ts"
-  },
-  "exports": {
-    ".": {
-      "source": "./src/index.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs",
-      "types": "./dist/types/src/index.d.ts"
-    },
-    "./blueprints": {
+    "#blueprints": {
       "source": "./src/blueprints/index.ts",
-      "browser": "./dist/lib/browser/blueprints/index.mjs",
-      "node": "./dist/lib/node-esm/blueprints/index.mjs",
-      "types": "./dist/types/src/blueprints/index.d.ts"
+      "types": "./dist/types/src/blueprints/index.d.ts",
+      "default": "./dist/lib/neutral/blueprints/index.mjs"
+    },
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
     },
-    "./operations": {
+    "#components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "#containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
+    },
+    "#hooks": {
+      "source": "./src/hooks/index.ts",
+      "types": "./dist/types/src/hooks/index.d.ts",
+      "default": "./dist/lib/neutral/hooks/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#operations": {
       "source": "./src/operations/index.ts",
-      "browser": "./dist/lib/browser/operations/index.mjs",
-      "node": "./dist/lib/node-esm/operations/index.mjs",
-      "types": "./dist/types/src/operations/index.d.ts"
+      "types": "./dist/types/src/operations/index.d.ts",
+      "default": "./dist/lib/neutral/operations/index.mjs"
+    },
+    "#plugin": {
+      "source": {
+        "node": "./src/ThreadPlugin.node.ts",
+        "default": "./src/ThreadPlugin.tsx"
+      },
+      "types": "./dist/types/src/ThreadPlugin.d.ts",
+      "node": "./dist/lib/neutral/ThreadPlugin.node.mjs",
+      "default": "./dist/lib/neutral/ThreadPlugin.mjs"
     },
-    "./types": {
+    "#testing": {
+      "source": "./src/testing/index.ts",
+      "types": "./dist/types/src/testing/index.d.ts",
+      "default": "./dist/lib/neutral/testing/index.mjs"
+    },
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
+    },
+    "#types": {
       "source": "./src/types/index.ts",
-      "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs",
-      "types": "./dist/types/src/types/index.d.ts"
+      "types": "./dist/types/src/types/index.d.ts",
+      "default": "./dist/lib/neutral/types/index.mjs"
     }
   },
-  "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "blueprints": [
-        "dist/types/src/blueprints/index.d.ts"
-      ],
-      "operations": [
-        "dist/types/src/operations/index.d.ts"
-      ],
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
+  "exports": {
+    ".": {
+      "source": "./src/index.ts",
+      "types": "./dist/types/src/index.d.ts",
+      "default": "./dist/lib/neutral/index.mjs"
+    },
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
+  "types": "dist/types/src/index.d.ts",
   "files": [
     "dist",
     "src"
@@ -70,62 +98,58 @@
   "dependencies": {
     "@codemirror/language": "^6.11.3",
     "@codemirror/state": "^6.5.2",
-    "@codemirror/view": "^6.38.4",
+    "@codemirror/view": "^6.38.5",
     "@effect-atom/atom": "^0.5.1",
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/ai": "0.33.2",
     "@effect/experimental": "0.58.0",
-    "@peermetrics/webrtc-stats": "5.7.1",
     "date-fns": "^3.6.0",
-    "extendable-media-recorder": "^9.2.19",
-    "extendable-media-recorder-wav-encoder": "^7.0.123",
-    "md5-hex": "5.0.0",
-    "react-resize-detector": "^11.0.1",
-    "wavefile": "^11.0.0",
-    "@dxos/app-framework": "0.8.4-main.74a063c4e0",
-    "@dxos/assistant": "0.8.4-main.74a063c4e0",
-    "@dxos/app-toolkit": "0.8.4-main.74a063c4e0",
-    "@dxos/async": "0.8.4-main.74a063c4e0",
-    "@dxos/debug": "0.8.4-main.74a063c4e0",
-    "@dxos/context": "0.8.4-main.74a063c4e0",
-    "@dxos/codec-protobuf": "0.8.4-main.74a063c4e0",
-    "@dxos/echo": "0.8.4-main.74a063c4e0",
-    "@dxos/devtools": "0.8.4-main.74a063c4e0",
-    "@dxos/display-name": "0.8.4-main.74a063c4e0",
-    "@dxos/echo-db": "0.8.4-main.74a063c4e0",
-    "@dxos/echo-react": "0.8.4-main.74a063c4e0",
-    "@dxos/functions": "0.8.4-main.74a063c4e0",
-    "@dxos/effect": "0.8.4-main.74a063c4e0",
-    "@dxos/keys": "0.8.4-main.74a063c4e0",
-    "@dxos/operation": "0.8.4-main.74a063c4e0",
-    "@dxos/invariant": "0.8.4-main.74a063c4e0",
-    "@dxos/log": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-attention": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-client": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-deck": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-markdown": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-graph": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-observability": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-settings": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-space": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-attention": "0.8.4-main.74a063c4e0",
-    "@dxos/protocols": "0.8.4-main.74a063c4e0",
-    "@dxos/react-client": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-editor": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-menu": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-form": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-dnd": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-mosaic": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-sfx": "0.8.4-main.74a063c4e0",
-    "@dxos/blueprints": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-tabs": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-thread": "0.8.4-main.74a063c4e0",
-    "@dxos/schema": "0.8.4-main.74a063c4e0",
-    "@dxos/types": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-stack": "0.8.4-main.74a063c4e0",
-    "@dxos/ui-editor": "0.8.4-main.74a063c4e0",
-    "@dxos/util": "0.8.4-main.74a063c4e0"
+    "@dxos/app-toolkit": "0.8.4-main.765dc60934",
+    "@dxos/assistant": "0.8.4-main.765dc60934",
+    "@dxos/app-framework": "0.8.4-main.765dc60934",
+    "@dxos/async": "0.8.4-main.765dc60934",
+    "@dxos/client-protocol": "0.8.4-main.765dc60934",
+    "@dxos/compute": "0.8.4-main.765dc60934",
+    "@dxos/context": "0.8.4-main.765dc60934",
+    "@dxos/debug": "0.8.4-main.765dc60934",
+    "@dxos/codec-protobuf": "0.8.4-main.765dc60934",
+    "@dxos/devtools": "0.8.4-main.765dc60934",
+    "@dxos/display-name": "0.8.4-main.765dc60934",
+    "@dxos/echo-db": "0.8.4-main.765dc60934",
+    "@dxos/echo": "0.8.4-main.765dc60934",
+    "@dxos/echo-react": "0.8.4-main.765dc60934",
+    "@dxos/effect": "0.8.4-main.765dc60934",
+    "@dxos/invariant": "0.8.4-main.765dc60934",
+    "@dxos/log": "0.8.4-main.765dc60934",
+    "@dxos/plugin-attention": "0.8.4-main.765dc60934",
+    "@dxos/operation": "0.8.4-main.765dc60934",
+    "@dxos/plugin-client": "0.8.4-main.765dc60934",
+    "@dxos/plugin-calls": "0.8.4-main.765dc60934",
+    "@dxos/keys": "0.8.4-main.765dc60934",
+    "@dxos/plugin-deck": "0.8.4-main.765dc60934",
+    "@dxos/plugin-graph": "0.8.4-main.765dc60934",
+    "@dxos/plugin-markdown": "0.8.4-main.765dc60934",
+    "@dxos/plugin-observability": "0.8.4-main.765dc60934",
+    "@dxos/plugin-space": "0.8.4-main.765dc60934",
+    "@dxos/protocols": "0.8.4-main.765dc60934",
+    "@dxos/plugin-settings": "0.8.4-main.765dc60934",
+    "@dxos/random": "0.8.4-main.765dc60934",
+    "@dxos/react-client": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-attention": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-editor": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-dnd": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-form": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-menu": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-mosaic": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-stack": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-sfx": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-tabs": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-thread": "0.8.4-main.765dc60934",
+    "@dxos/schema": "0.8.4-main.765dc60934",
+    "@dxos/ui-editor": "0.8.4-main.765dc60934",
+    "@dxos/util": "0.8.4-main.765dc60934",
+    "@dxos/types": "0.8.4-main.765dc60934"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -135,13 +159,12 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/plugin-theme": "0.8.4-main.74a063c4e0",
-    "@dxos/random": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui": "0.8.4-main.74a063c4e0",
-    "@dxos/storybook-utils": "0.8.4-main.74a063c4e0",
-    "@dxos/ui-theme": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-testing": "0.8.4-main.74a063c4e0"
+    "vite": "^8.0.13",
+    "@dxos/plugin-testing": "0.8.4-main.765dc60934",
+    "@dxos/react-ui": "0.8.4-main.765dc60934",
+    "@dxos/storybook-utils": "0.8.4-main.765dc60934",
+    "@dxos/plugin-theme": "0.8.4-main.765dc60934",
+    "@dxos/ui-theme": "0.8.4-main.765dc60934"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -149,10 +172,7 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/ui-theme": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui": "0.8.4-main.74a063c4e0"
-  },
-  "publishConfig": {
-    "access": "public"
+    "@dxos/react-ui": "0.8.4-main.765dc60934",
+    "@dxos/ui-theme": "0.8.4-main.765dc60934"
   }
 }

package/src/ThreadPlugin.node.ts

@@ -0,0 +1,39 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability, Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space';
+import { AnchoredTo, Channel, Message, Thread } from '@dxos/types';
+
+import { AppGraphBuilder, BlueprintDefinition, CreateObject, OperationHandler, UndoMappings } from '#capabilities';
+import { meta } from '#meta';
+import { ThreadOperation } from '#types';
+
+export const ThreadPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addUndoMappingsModule({ activate: UndoMappings }),
+  AppPlugin.addSchemaModule({
+    schema: [AnchoredTo.AnchoredTo, Channel.Channel, Message.Message, Thread.Thread],
+  }),
+  Plugin.addModule({
+    id: 'on-space-created',
+    activatesOn: SpaceEvents.SpaceCreated,
+    activate: () =>
+      Effect.succeed(
+        Capability.contributes(SpaceCapabilities.OnCreateSpace, (params) =>
+          Operation.invoke(ThreadOperation.OnCreateSpace, params),
+        ),
+      ),
+  }),
+  Plugin.make,
+);
+
+export default ThreadPlugin;

package/src/ThreadPlugin.test.ts

@@ -0,0 +1,37 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { AppActivationEvents } from '@dxos/app-toolkit';
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { ThreadPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('ThreadPlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [ClientPlugin({}), ThreadPlugin()],
+    });
+
+    // After autoStart: AppGraphBuilder, CreateObject, schema, OperationHandler, UndoMappings all auto-cascade.
+    expect(harness.manager.getActive()).toEqual(
+      expect.arrayContaining([moduleId('AppGraphBuilder'), moduleId('CreateObject'), moduleId('schema')]),
+    );
+
+    // SetupArtifactDefinition is fired by AssistantPlugin, which can't be included here due to a workspace cycle.
+    await harness.fire(AppActivationEvents.SetupArtifactDefinition);
+    expect(harness.manager.getActive()).toContain(moduleId('BlueprintDefinition'));
+
+    // Operation handlers auto-cascade from OperationPlugin.
+    expect(harness.manager.getActive()).toEqual(
+      expect.arrayContaining([moduleId('OperationHandler'), moduleId('UndoMappings')]),
+    );
+  });
+});

package/src/ThreadPlugin.tsx

@@ -3,35 +3,28 @@
 //
 
 import * as Effect from 'effect/Effect';
-import * as Option from 'effect/Option';
 
 import { Capability, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
-import { Annotation, Ref, Type } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
-import { ClientEvents } from '@dxos/plugin-client/types';
+import { Operation } from '@dxos/compute';
 import { MarkdownEvents } from '@dxos/plugin-markdown';
-import { SpaceOperation } from '@dxos/plugin-space/operations';
-import { SpaceCapabilities, SpaceEvents, type CreateObject } from '@dxos/plugin-space/types';
-import { translations as threadTranslations } from '@dxos/react-ui-thread';
-import { AnchoredTo, Message, Thread } from '@dxos/types';
+import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space';
+import { translations as threadTranslations } from '@dxos/react-ui-thread/translations';
+import { AnchoredTo, Channel, Message, Thread } from '@dxos/types';
 
 import {
   AppGraphBuilder,
   BlueprintDefinition,
-  CallManager,
+  CreateObject,
   Markdown,
   OperationHandler,
   UndoMappings,
-  ReactRoot,
   ReactSurface,
   ThreadState,
 } from '#capabilities';
-import { THREAD_ITEM, meta } from '#meta';
-import { ThreadOperation } from '#operations';
-import { Channel } from '#types';
-
-import { translations } from './translations';
+import { meta } from '#meta';
+import { translations } from '#translations';
+import { ThreadOperation } from '#types';
 
 // TODO(Zan): Every instance of `cursor` should be replaced with `anchor`.
 //  NOTE(burdon): Review/discuss CursorConverter semantics.
@@ -42,62 +35,14 @@ import { translations } from './translations';
 export const ThreadPlugin = Plugin.define(meta).pipe(
   AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
   AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
-  AppPlugin.addMetadataModule({
-    metadata: [
-      {
-        id: Type.getTypename(Channel.Channel),
-        metadata: {
-          icon: Annotation.IconAnnotation.get(Channel.Channel).pipe(Option.getOrThrow).icon,
-          iconHue: Annotation.IconAnnotation.get(Channel.Channel).pipe(Option.getOrThrow).hue ?? 'white',
-          createObject: ((props, options) =>
-            Effect.gen(function* () {
-              const object = Channel.make(props);
-              return yield* Operation.invoke(SpaceOperation.AddObject, {
-                object,
-                target: options.target,
-                hidden: true,
-                targetNodeId: options.targetNodeId,
-              });
-            })) satisfies CreateObject,
-        },
-      },
-      {
-        id: Type.getTypename(Thread.Thread),
-        metadata: {
-          // TODO(wittjosiah): Move out of metadata.
-          loadReferences: async (thread: Thread.Thread) => await Ref.Array.loadAll(thread.messages ?? []),
-        },
-      },
-      {
-        id: THREAD_ITEM,
-        metadata: {
-          parse: (item: Thread.Thread, type: string) => {
-            switch (type) {
-              case 'node':
-                return { id: item.id, label: item.name, data: item };
-              case 'object':
-                return item;
-              case 'view-object':
-                return { id: `${item.id}-view`, object: item };
-            }
-          },
-        },
-      },
-    ],
-  }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
   AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
-  AppPlugin.addOperationHandlerModule({ id: 'undo-mappings', activate: UndoMappings }),
-  AppPlugin.addReactRootModule({ activate: ReactRoot }),
+  AppPlugin.addUndoMappingsModule({ activate: UndoMappings }),
   AppPlugin.addSchemaModule({
     schema: [AnchoredTo.AnchoredTo, Channel.Channel, Message.Message, Thread.Thread],
   }),
   AppPlugin.addSurfaceModule({ activate: ReactSurface }),
   AppPlugin.addTranslationsModule({ translations: [...translations, ...threadTranslations] }),
-  Plugin.addModule({
-    id: 'call-manager',
-    activatesOn: ClientEvents.ClientReady,
-    activate: CallManager,
-  }),
   // TODO(wittjosiah): Currently not used but leaving because there will likely be settings for threads again.
   // Plugin.addModule({
   //   id: 'settings',
@@ -129,3 +74,5 @@ export const ThreadPlugin = Plugin.define(meta).pipe(
   }),
   Plugin.make,
 );
+
+export default ThreadPlugin;

package/src/blueprints/thread-blueprint.ts

@@ -2,11 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type AppCapabilities } from '@dxos/app-toolkit';
-import { Blueprint, Template } from '@dxos/blueprints';
+import { Blueprint, Template } from '@dxos/compute';
 import { trim } from '@dxos/util';
 
-import { ThreadOperation } from '#operations';
+import { ThreadOperation } from '#types';
 
 const BLUEPRINT_KEY = 'org.dxos.blueprint.thread';
 
@@ -29,7 +28,7 @@ const make = () =>
     }),
   });
 
-const blueprint: AppCapabilities.BlueprintDefinition = {
+const blueprint: Blueprint.Definition = {
   key: BLUEPRINT_KEY,
   make,
 };

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

@@ -8,16 +8,17 @@ import * as Option from 'effect/Option';
 
 import { Capability } from '@dxos/app-framework';
 import { AppCapabilities, AppNode } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
 import { Obj } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
-import { AttentionCapabilities } from '@dxos/plugin-attention/types';
+import { AttentionCapabilities } from '@dxos/plugin-attention';
 import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
 import { linkedSegment } from '@dxos/react-ui-attention';
 import { type SelectionManager, type SelectionMode, defaultSelection } from '@dxos/react-ui-attention';
+import { Channel } from '@dxos/types';
 
 import { meta } from '#meta';
-import { ThreadOperation } from '#operations';
-import { Channel, ThreadCapabilities, type ThreadState } from '#types';
+import { ThreadOperation } from '#types';
+import { ThreadCapabilities, type ThreadState } from '#types';
 
 import { getAnchor } from '../util';
 
@@ -55,74 +56,22 @@ const whenCommentableObject = NodeMatcher.whenAll(
   NodeMatcher.whenNot(NodeMatcher.whenEchoTypeMatches(Channel.Channel)),
 );
 
-// TODO(wittjosiah): Highlight active calls in L1.
-//  Track active meetings by subscribing to meetings query and polling the swarms of recent meetings in the space.
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     const capabilities = yield* Capability.Service;
 
-    const resolve = (typename: string) =>
-      capabilities.getAll(AppCapabilities.Metadata).find(({ id }: { id: string }) => id === typename)?.metadata ?? {};
+    const getCommentConfig = (typename: string) =>
+      capabilities.getAll(AppCapabilities.CommentConfig).find(({ id }) => id === typename);
 
     const extensions = yield* Effect.all([
-      GraphBuilder.createExtension({
-        id: 'active-call',
-        match: NodeMatcher.whenRoot,
-        connector: (node, get) => {
-          const callManagerAtom = capabilities.atom(ThreadCapabilities.CallManager);
-          const [call] = get(callManagerAtom);
-          if (!call) {
-            return Effect.succeed([]);
-          }
-          // Use derived joinedAtom for efficient subscription.
-          const joined = get(call.joinedAtom);
-          return Effect.succeed(
-            joined
-              ? [
-                  AppNode.makeDeckCompanion({
-                    id: 'active-call',
-                    label: ['call-panel.label', { ns: meta.id }],
-                    icon: 'ph--video-conference--regular',
-                    data: null,
-                    position: 'hoist',
-                  }),
-                ]
-              : [],
-          );
-        },
-      }),
-      GraphBuilder.createTypeExtension({
-        id: 'channel-chat-companion',
-        type: Channel.Channel,
-        connector: (channel, get) => {
-          const callManager = capabilities.get(ThreadCapabilities.CallManager);
-          // Use derived atoms for efficient subscription.
-          const joined = get(callManager.joinedAtom);
-          const roomId = get(callManager.roomIdAtom);
-          const isActive = joined && roomId === Obj.getDXN(channel).toString();
-          if (!isActive) {
-            return Effect.succeed([]);
-          }
-
-          return Effect.succeed([
-            AppNode.makeCompanion({
-              id: 'chat',
-              label: ['channel-companion.label', { ns: meta.id }],
-              icon: 'ph--hash--regular',
-              data: 'chat',
-              position: 'hoist',
-            }),
-          ]);
-        },
-      }),
       GraphBuilder.createExtension({
         id: 'comments-companion',
         match: (node) => {
           if (!Obj.isObject(node.data) || Option.isNone(whenCommentableObject(node))) {
             return Option.none();
           }
-          const metadata = resolve(Obj.getTypename(node.data)!);
-          return typeof metadata.comments === 'string' ? Option.some(node) : Option.none();
+          const commentConfig = getCommentConfig(Obj.getTypename(node.data)!);
+          return commentConfig ? Option.some(node) : Option.none();
         },
         connector: () =>
           Effect.succeed([
@@ -141,23 +90,23 @@ export default Capability.makeModule(
           if (!Obj.isObject(node.data) || Option.isNone(whenCommentableObject(node))) {
             return Option.none();
           }
-          const metadata = resolve(Obj.getTypename(node.data)!);
-          return typeof metadata.comments === 'string' ? Option.some(node) : Option.none();
+          const commentConfig = getCommentConfig(Obj.getTypename(node.data)!);
+          return commentConfig ? Option.some(node) : Option.none();
         },
         actions: (matched, get) => {
           const object = matched.data;
-          const objectDxn = Obj.getDXN(object).toString();
+          const objectDXN = Obj.getDXN(object).toString();
           const stateAtom = capabilities.atom(ThreadCapabilities.State);
           const selectionManager = capabilities.get(AttentionCapabilities.Selection);
-          const metadata = resolve(Obj.getTypename(object)!);
+          const commentConfig = getCommentConfig(Obj.getTypename(object)!)!;
 
           const disabled = get(
             commentDisabledFamily({
               stateAtom,
               selectionManager,
-              objectId: objectDxn,
-              commentsType: metadata.comments as string,
-              selectionMode: metadata.selectionMode,
+              objectId: objectDXN,
+              commentsType: commentConfig.comments,
+              selectionMode: commentConfig.selectionMode as SelectionMode | undefined,
             }),
           );
 
@@ -165,10 +114,11 @@ export default Capability.makeModule(
             {
               id: 'comment',
               data: Effect.fnUntraced(function* () {
-                const metadata = resolve(Obj.getTypename(object)!);
-                const selection = selectionManager.getSelection(objectDxn);
-                const anchor = metadata.comments === 'anchored' ? getAnchor(selection) : Date.now().toString();
-                const name = metadata.getAnchorLabel?.(object, anchor);
+                const config = getCommentConfig(Obj.getTypename(object)!)!;
+                const selection = selectionManager.getSelection(objectDXN);
+                const anchor =
+                  (config.comments === 'anchored' ? getAnchor(selection) : undefined) ?? Date.now().toString();
+                const name = config.getAnchorLabel?.(object, anchor);
                 yield* Operation.invoke(ThreadOperation.Create, {
                   anchor,
                   name,